[CRIU] [PATCH 3/4] mount: master_id should be 0 for new mounts

Andrey Vagin avagin at openvz.org
Wed Mar 2 23:00:14 PST 2016


From: Andrew Vagin <avagin at virtuozzo.com>

Signed-off-by: Andrew Vagin <avagin at virtuozzo.com>
---
 criu/mount.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/criu/mount.c b/criu/mount.c
index ffafcf3..20a95d1 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -2259,9 +2259,8 @@ static int do_new_mount(struct mount_info *mi)
 		return -1;
 	}
 
-	if (restore_shared_options(mi, !mi->shared_id && !mi->master_id,
-					mi->shared_id,
-					mi->master_id))
+	BUG_ON(mi->master_id);
+	if (restore_shared_options(mi, !mi->shared_id, mi->shared_id, 0))
 		return -1;
 
 	mi->mounted = true;
-- 
2.5.0



More information about the CRIU mailing list