mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-02 15:25:21 +00:00
Code Issues Releases Wiki Activity

mnt: Use ns walking helper

Browse Source 
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2014-10-09 17:43:36 +04:00
parent a36917d4f2
commit 87d68fcafd
1 changed files with 21 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
mount.c
View File

@@ -2078,52 +2078,36 @@ int mntns_get_root_by_mnt_id(int mnt_id)
return mntns_get_root_fd(mntns); return mntns_get_root_fd(mntns);
} }
int collect_mnt_namespaces(void) static int collect_mntns(struct ns_id *ns, void *oarg)
{ {
struct mount_info *pms; struct mount_info *pms;
struct ns_id *ns;
int ret = -1;
for (ns = ns_ids; ns; ns = ns->next) { pms = collect_mntinfo(ns);
if (!(ns->nd->cflag & CLONE_NEWNS)) if (!pms)
continue; return -1;
if (ns->pid == getpid()) { if (ns->pid != getpid())
/* *(int *)oarg = 1;
* Collect criu's mounts only if the target
* task does NOT live in mount namespaces to
* make smart paths resolution work.
*
* Otherwise, the necessary list of mounts
* will be collected below.
*/
if ((root_ns_mask & CLONE_NEWNS))
continue;
mntinfo = collect_mntinfo(ns); mntinfo_add_list(pms);
if (mntinfo == NULL) return 0;
goto err; }
/*
* Mount namespaces are dumped only if the root task lives in
* its own mntns, so we can stop enumeration of namespaces.
* We are not going to dump this tree, so we skip validation.
*/
goto out;
}
pr_info("Dump MNT namespace (mountpoints) %d via %d\n", ns->id, ns->pid); int collect_mnt_namespaces(void)
pms = collect_mntinfo(ns); {
if (pms == NULL) int need_to_validate = 0, ret;
ret = walk_namespaces(&mnt_ns_desc, collect_mntns, &need_to_validate);
if (ret)
goto err;
if (need_to_validate) {
if (collect_shared(mntinfo))
goto err;
if (validate_mounts(mntinfo, true))
goto err; goto err;
mntinfo_add_list(pms);
} }
if (collect_shared(mntinfo))
goto err;
if (validate_mounts(mntinfo, true))
goto err;
out:
ret = 0; ret = 0;
err: err:
return ret; return ret;