mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 14:25:49 +00:00
Code Issues Releases Wiki Activity

mount: replace CRTIME_MNT_ID with HELPER_MNT_ID

Browse Source 
Root yard mount also has mnt_id == 0 so it will look better with a new
name. Let's explicitly initialize root yard mnt_id to HELPER_MNT_ID
for the sake of code readability.

Also in near future we might want to create additional mount helpers to support
mounts in CT with no fsroot mounted.

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

Changes: split umount hunk to previous patch, set HELPER_MNT_ID for root
yard.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
This commit is contained in:
Pavel Tikhomirov
2020-05-07 16:13:02 +03:00
committed by Andrei Vagin
parent 4736a7240e
commit b52fcb284a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
criu/mount.c
View File

@@ -37,7 +37,8 @@
#define LOG_PREFIX "mnt: " #define LOG_PREFIX "mnt: "
#define BINFMT_MISC_HOME "proc/sys/fs/binfmt_misc" #define BINFMT_MISC_HOME "proc/sys/fs/binfmt_misc"
#define CRTIME_MNT_ID 0
#define HELPER_MNT_ID 0
#define CONTEXT_OPT "context=" #define CONTEXT_OPT "context="
@@ -1595,7 +1596,7 @@ static __maybe_unused struct mount_info *add_cr_time_mount(struct mount_info *ro
sprintf(mi->mountpoint, "%s%s", root->mountpoint, path); sprintf(mi->mountpoint, "%s%s", root->mountpoint, path);
else else
sprintf(mi->mountpoint, "%s/%s", root->mountpoint, path); sprintf(mi->mountpoint, "%s/%s", root->mountpoint, path);
mi->mnt_id = CRTIME_MNT_ID; mi->mnt_id = HELPER_MNT_ID;
mi->flags = mi->sb_flags = 0; mi->flags = mi->sb_flags = 0;
mi->root = xstrdup("/"); mi->root = xstrdup("/");
mi->fsname = xstrdup(fsname); mi->fsname = xstrdup(fsname);
@@ -1718,8 +1719,8 @@ static int dump_one_mountpoint(struct mount_info *pm, struct cr_img *img)
pm->fstype->check_bindmount(pm)) pm->fstype->check_bindmount(pm))
return -1; return -1;
if (pm->mnt_id == CRTIME_MNT_ID) { if (pm->mnt_id == HELPER_MNT_ID) {
pr_info("Skip dumping cr-time mountpoint: %s\n", pm->mountpoint); pr_info("Skip dumping helper mountpoint: %s\n", pm->mountpoint);
return 0; return 0;
} }
@@ -3414,6 +3415,7 @@ static int populate_mnt_ns(void)
root_yard_mp->mountpoint = mnt_roots; root_yard_mp->mountpoint = mnt_roots;
root_yard_mp->mounted = true; root_yard_mp->mounted = true;
root_yard_mp->mnt_bind_is_populated = true; root_yard_mp->mnt_bind_is_populated = true;
root_yard_mp->mnt_id = HELPER_MNT_ID;
if (merge_mount_trees(root_yard_mp)) if (merge_mount_trees(root_yard_mp))
return -1; return -1;
@@ -3931,7 +3933,7 @@ void clean_cr_time_mounts(void)
for (mi = mntinfo; mi; mi = mi->next) { for (mi = mntinfo; mi; mi = mi->next) {
int cwd_fd; int cwd_fd;
if (mi->mnt_id != CRTIME_MNT_ID) if (mi->mnt_id != HELPER_MNT_ID)
continue; continue;
ret = switch_mnt_ns(mi->nsid->ns_pid, &ns_old, &cwd_fd); ret = switch_mnt_ns(mi->nsid->ns_pid, &ns_old, &cwd_fd);
if (ret) { if (ret) {