Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
criu
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhul
criu
Commits
dc149e88
Commit
dc149e88
authored
Jun 25, 2015
by
Pavel Emelyanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rst: Remove actually unused pid arg from prepare_mappings
Signed-off-by:
Pavel Emelyanov
<
xemul@parallels.com
>
parent
73e3925b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
cr-restore.c
cr-restore.c
+9
-9
No files found.
cr-restore.c
View file @
dc149e88
...
@@ -241,7 +241,7 @@ err:
...
@@ -241,7 +241,7 @@ err:
}
}
/* Map a private vma, if it is not mapped by a parent yet */
/* Map a private vma, if it is not mapped by a parent yet */
static
int
map_private_vma
(
pid_t
pid
,
struct
vma_area
*
vma
,
void
**
tgt_addr
,
static
int
map_private_vma
(
struct
vma_area
*
vma
,
void
**
tgt_addr
,
struct
vma_area
**
pvma
,
struct
list_head
*
pvma_list
)
struct
vma_area
**
pvma
,
struct
list_head
*
pvma_list
)
{
{
int
ret
;
int
ret
;
...
@@ -352,7 +352,7 @@ static int map_private_vma(pid_t pid, struct vma_area *vma, void **tgt_addr,
...
@@ -352,7 +352,7 @@ static int map_private_vma(pid_t pid, struct vma_area *vma, void **tgt_addr,
return
0
;
return
0
;
}
}
static
int
premap_priv_vmas
(
pid_t
pid
,
struct
vm_area_list
*
vmas
,
void
*
at
)
static
int
premap_priv_vmas
(
struct
vm_area_list
*
vmas
,
void
*
at
)
{
{
struct
list_head
*
parent_vmas
;
struct
list_head
*
parent_vmas
;
struct
vma_area
*
pvma
,
*
vma
;
struct
vma_area
*
pvma
,
*
vma
;
...
@@ -382,7 +382,7 @@ static int premap_priv_vmas(pid_t pid, struct vm_area_list *vmas, void *at)
...
@@ -382,7 +382,7 @@ static int premap_priv_vmas(pid_t pid, struct vm_area_list *vmas, void *at)
if
(
!
vma_area_is_private
(
vma
))
if
(
!
vma_area_is_private
(
vma
))
continue
;
continue
;
ret
=
map_private_vma
(
pid
,
vma
,
&
at
,
&
pvma
,
parent_vmas
);
ret
=
map_private_vma
(
vma
,
&
at
,
&
pvma
,
parent_vmas
);
if
(
ret
<
0
)
if
(
ret
<
0
)
break
;
break
;
}
}
...
@@ -390,7 +390,7 @@ static int premap_priv_vmas(pid_t pid, struct vm_area_list *vmas, void *at)
...
@@ -390,7 +390,7 @@ static int premap_priv_vmas(pid_t pid, struct vm_area_list *vmas, void *at)
return
ret
;
return
ret
;
}
}
static
int
restore_priv_vma_content
(
pid_t
p
id
)
static
int
restore_priv_vma_content
(
vo
id
)
{
{
struct
vma_area
*
vma
;
struct
vma_area
*
vma
;
int
ret
=
0
;
int
ret
=
0
;
...
@@ -405,7 +405,7 @@ static int restore_priv_vma_content(pid_t pid)
...
@@ -405,7 +405,7 @@ static int restore_priv_vma_content(pid_t pid)
vma
=
list_first_entry
(
vmas
,
struct
vma_area
,
list
);
vma
=
list_first_entry
(
vmas
,
struct
vma_area
,
list
);
ret
=
open_page_read
(
pid
,
&
pr
,
PR_TASK
);
ret
=
open_page_read
(
current
->
pid
.
virt
,
&
pr
,
PR_TASK
);
if
(
ret
<=
0
)
if
(
ret
<=
0
)
return
-
1
;
return
-
1
;
...
@@ -533,7 +533,7 @@ err_addr:
...
@@ -533,7 +533,7 @@ err_addr:
return
-
1
;
return
-
1
;
}
}
static
int
prepare_mappings
(
int
p
id
)
static
int
prepare_mappings
(
vo
id
)
{
{
int
ret
=
0
;
int
ret
=
0
;
void
*
addr
;
void
*
addr
;
...
@@ -559,11 +559,11 @@ static int prepare_mappings(int pid)
...
@@ -559,11 +559,11 @@ static int prepare_mappings(int pid)
rsti
(
current
)
->
premmapped_addr
=
addr
;
rsti
(
current
)
->
premmapped_addr
=
addr
;
rsti
(
current
)
->
premmapped_len
=
vmas
->
priv_size
;
rsti
(
current
)
->
premmapped_len
=
vmas
->
priv_size
;
ret
=
premap_priv_vmas
(
pid
,
vmas
,
addr
);
ret
=
premap_priv_vmas
(
vmas
,
addr
);
if
(
ret
<
0
)
if
(
ret
<
0
)
goto
out
;
goto
out
;
ret
=
restore_priv_vma_content
(
pid
);
ret
=
restore_priv_vma_content
();
if
(
ret
<
0
)
if
(
ret
<
0
)
goto
out
;
goto
out
;
...
@@ -1496,7 +1496,7 @@ static int restore_task_with_children(void *_arg)
...
@@ -1496,7 +1496,7 @@ static int restore_task_with_children(void *_arg)
goto
err_fini_mnt
;
goto
err_fini_mnt
;
}
}
if
(
prepare_mappings
(
pid
))
if
(
prepare_mappings
())
goto
err_fini_mnt
;
goto
err_fini_mnt
;
if
(
!
(
ca
->
clone_flags
&
CLONE_FILES
))
{
if
(
!
(
ca
->
clone_flags
&
CLONE_FILES
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment