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

mount: save remapped links on tmpfs (v2)

Browse Source 
For that mnt namespaces should be dumped after files.

v2: rework enumeration of namespaces in dump_mnt_namespaces()
Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Andrey Vagin
2014-08-03 23:31:04 +04:00
committed by Pavel Emelyanov
parent 8d446a7af4
commit e4e22a00f7
2 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cr-dump.c
View File

@@ -1803,7 +1803,7 @@ int cr_dump_tasks(pid_t pid)
if (collect_file_locks()) if (collect_file_locks())
goto err; goto err;
if (dump_mnt_namespaces() < 0) if (collect_mnt_namespaces() < 0)
goto err; goto err;
if (collect_sockets(pid)) if (collect_sockets(pid))
@@ -1818,6 +1818,10 @@ int cr_dump_tasks(pid_t pid)
goto err; goto err;
} }
/* MNT namespaces are dumped after files to save remapped links */
if (dump_mnt_namespaces() < 0)
goto err;
if (dump_verify_tty_sids()) if (dump_verify_tty_sids())
goto err; goto err;

35
mount.c
View File

@@ -996,20 +996,12 @@ err:
return NULL; return NULL;
} }
static int dump_mnt_ns(struct ns_id *ns, struct mount_info *pms, void *a) static int dump_mnt_ns(struct ns_id *ns, struct mount_info *pms)
{ {
int *n = a;
struct mount_info *pm; struct mount_info *pm;
int img_fd = -1, ret = -1; int img_fd = -1, ret = -1;
int ns_id = ns->id; int ns_id = ns->id;
(*n)++;
if (*n == 2 && check_mnt_id()) {
pr_err("Nested mount namespaces are not supported "
"without mnt_id in fdinfo\n");
goto err;
}
if (validate_mounts(pms, true)) if (validate_mounts(pms, true))
goto err; goto err;
@@ -1018,7 +1010,7 @@ static int dump_mnt_ns(struct ns_id *ns, struct mount_info *pms, void *a)
if (img_fd < 0) if (img_fd < 0)
goto err; goto err;
for (pm = pms; pm; pm = pm->next) for (pm = pms; pm && pm->nsid == ns; pm = pm->next)
if (dump_one_mountpoint(pm, img_fd)) if (dump_one_mountpoint(pm, img_fd))
goto err_i; goto err_i;
@@ -2122,8 +2114,29 @@ int collect_mnt_namespaces(void)
int dump_mnt_namespaces(void) int dump_mnt_namespaces(void)
{ {
struct ns_id *nsid = NULL;
struct mount_info *m;
int n = 0; int n = 0;
return walk_mnt_ns(dump_mnt_ns, &n);
if (!(root_ns_mask & CLONE_NEWNS))
return 0;
for (m = mntinfo; m; m = m->next) {
if (m->nsid == nsid)
continue;
if (++n == 2 && check_mnt_id()) {
pr_err("Nested mount namespaces are not supported "
"without mnt_id in fdinfo\n");
return -1;
}
if (dump_mnt_ns(m->nsid, m))
return -1;
nsid = m->nsid;
}
return 0;
} }
struct ns_desc mnt_ns_desc = NS_DESC_ENTRY(CLONE_NEWNS, "mnt"); struct ns_desc mnt_ns_desc = NS_DESC_ENTRY(CLONE_NEWNS, "mnt");