mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-30 22:05:36 +00:00
Code Issues Releases Wiki Activity

mount: allow nested mount namespaces with different roots

Browse Source 
Only root in root-mntns is special (see rst_mnt_is_root) all other
mounts are mounted regulary there is no difference between ns root and
any other mount or bind-mount.

Cherry-picked from Virtuozzo criu:
https://src.openvz.org/projects/OVZ/repos/criu/commits/f41e41dd5

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
This commit is contained in:
Pavel Tikhomirov
2020-04-27 18:24:54 +03:00
committed by Andrei Vagin
parent cf6fe2d48b
commit 2fdb4993a0
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
criu/mount.c
View File

@@ -3362,7 +3362,6 @@ void fini_restore_mntns(void)
static int merge_mount_trees(struct mount_info *root_yard)
{
struct mount_info *first = NULL;
struct ns_id *nsid;
/* Merge mount trees together under root_yard */
@@ -3374,16 +3373,6 @@ static int merge_mount_trees(struct mount_info *root_yard)
root = nsid->mnt.mntinfo_tree;
if (!first)
first = root;
else if (!mounts_sb_equal(root, first) || strcmp(root->root, first->root)) {
pr_err("Nested mount namespaces with different "
"roots %d (@%s %s) %d (@%s %s) are not supported yet\n",
root->mnt_id, root->mountpoint, root->root, first->mnt_id, first->mountpoint,
first->root);
return -1;
}
pr_debug("Mountpoint %d (@%s) moved to the root yard\n", root->mnt_id, root->mountpoint);
root->parent = root_yard;
list_add(&root->siblings, &root_yard->children);