mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-01 14:55:39 +00:00
Code Issues Releases Wiki Activity

rst: Remove extra calls when fixing up maps fds

Browse Source 
Acked-by: Andrey Vagin <avagin@parallels.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2012-03-21 19:37:00 +04:00
parent 8639776154
commit 29e07fa24f
1 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
cr-restore.c
View File

@@ -103,7 +103,7 @@ pid_t pstree_pid;
struct pstree_item *me; struct pstree_item *me;
static int restore_task_with_children(void *); static int restore_task_with_children(void *);
static void sigreturn_restore(pid_t pid); static int sigreturn_restore(pid_t pid);
static void show_saved_shmems(void) static void show_saved_shmems(void)
{ {
@@ -586,38 +586,21 @@ static int fixup_vma_fds(int pid, int fd)
} }
} }
static int prepare_image_maps(int fd, int pid)
{
pr_info("%d: Fixing maps\n", pid);
if (fixup_vma_fds(pid, fd))
return -1;
pr_info("%d: Fixing maps\n", pid);
return 0;
}
static int prepare_and_sigreturn(int pid) static int prepare_and_sigreturn(int pid)
{ {
char path[PATH_MAX]; int fd, err;
int fd = -1, err = -1;
struct stat buf;
fd = open_image(CR_FD_VMAS, O_RDWR, pid); fd = open_image(CR_FD_VMAS, O_RDWR, pid);
if (fd < 0) if (fd < 0)
return -1; return -1;
if (prepare_image_maps(fd, pid)) err = fixup_vma_fds(pid, fd);
goto out;
err = 0;
out:
close_safe(&fd); close_safe(&fd);
if (err) if (err)
return err; return err;
sigreturn_restore(pid);
return 0; return sigreturn_restore(pid);
} }
#define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME) #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
@@ -1488,7 +1471,7 @@ static int prepare_creds(int pid, struct task_restore_core_args *args)
return ret > 0 ? 0 : -1; return ret > 0 ? 0 : -1;
} }
static void sigreturn_restore(pid_t pid) static int sigreturn_restore(pid_t pid)
{ {
long restore_code_len, restore_task_vma_len; long restore_code_len, restore_task_vma_len;
long restore_thread_vma_len, self_vmas_len; long restore_thread_vma_len, self_vmas_len;
@@ -1760,6 +1743,7 @@ err:
/* Just to be sure */ /* Just to be sure */
exit(1); exit(1);
return -1;
} }
int cr_restore_tasks(pid_t pid, struct cr_options *opts) int cr_restore_tasks(pid_t pid, struct cr_options *opts)