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

mnt: Don't include fake root entry in every mnt tree

Browse Source 
This entry is only required if we have it, i.e. -- at restore stage
in the tree we _built_. All other cases, in particular, local tree
collection on restore, do not need such.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Acked-by: Andrew Vagin <avagin@odin.com>
This commit is contained in:
Pavel Emelyanov
2015-09-29 17:19:00 +03:00
parent e55236f586
commit 80b66ee15d
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mount.c
View File

@@ -84,7 +84,7 @@ static void mntinfo_add_list(struct mount_info *new)
static int open_mountpoint(struct mount_info *pm); static int open_mountpoint(struct mount_info *pm);
static struct mount_info *mnt_build_tree(struct mount_info *list); static struct mount_info *mnt_build_tree(struct mount_info *list, bool insert_roots);
static int validate_mounts(struct mount_info *info, bool for_dump); static int validate_mounts(struct mount_info *info, bool for_dump);
/* Asolute paths are used on dump and relative paths are used on restore */ /* Asolute paths are used on dump and relative paths are used on restore */
@@ -302,12 +302,12 @@ static bool mounts_equal(struct mount_info* mi, struct mount_info *c, bool bind)
*/ */
static char *mnt_roots; static char *mnt_roots;
static struct mount_info *mnt_build_ids_tree(struct mount_info *list) static struct mount_info *mnt_build_ids_tree(struct mount_info *list, bool insert_roots)
{ {
struct mount_info *m, *root = NULL; struct mount_info *m, *root = NULL;
struct mount_info *tmp_root_mount = NULL; struct mount_info *tmp_root_mount = NULL;
if (mnt_roots) { if (insert_roots && mnt_roots) {
/* mnt_roots is a tmpfs mount and it's private */ /* mnt_roots is a tmpfs mount and it's private */
tmp_root_mount = mnt_entry_alloc(); tmp_root_mount = mnt_entry_alloc();
if (!tmp_root_mount) if (!tmp_root_mount)
@@ -379,7 +379,7 @@ static struct mount_info *mnt_build_ids_tree(struct mount_info *list)
return NULL; return NULL;
} }
if (mnt_roots) { if (tmp_root_mount) {
tmp_root_mount->parent = root; tmp_root_mount->parent = root;
list_add_tail(&tmp_root_mount->siblings, &root->children); list_add_tail(&tmp_root_mount->siblings, &root->children);
} }
@@ -966,7 +966,7 @@ static int resolve_shared_mounts(struct mount_info *info)
return 0; return 0;
} }
static struct mount_info *mnt_build_tree(struct mount_info *list) static struct mount_info *mnt_build_tree(struct mount_info *list, bool insert_roots)
{ {
struct mount_info *tree; struct mount_info *tree;
@@ -975,7 +975,7 @@ static struct mount_info *mnt_build_tree(struct mount_info *list)
*/ */
pr_info("Building mountpoints tree\n"); pr_info("Building mountpoints tree\n");
tree = mnt_build_ids_tree(list); tree = mnt_build_ids_tree(list, insert_roots);
if (!tree) if (!tree)
return NULL; return NULL;
@@ -1652,7 +1652,7 @@ struct mount_info *collect_mntinfo(struct ns_id *ns, bool for_dump)
return NULL; return NULL;
} }
ns->mnt.mntinfo_tree = mnt_build_tree(pm); ns->mnt.mntinfo_tree = mnt_build_tree(pm, false);
if (ns->mnt.mntinfo_tree == NULL) if (ns->mnt.mntinfo_tree == NULL)
goto err; goto err;
@@ -2673,7 +2673,7 @@ static int populate_mnt_ns(void)
struct mount_info *pms; struct mount_info *pms;
struct ns_id *nsid; struct ns_id *nsid;
pms = mnt_build_tree(mntinfo); pms = mnt_build_tree(mntinfo, true);
if (!pms) if (!pms)
return -1; return -1;