[CRIU] [PATCH CRIU 4/4] mount: if mount should have master we must not set mount private

Pavel Tikhomirov ptikhomirov at virtuozzo.com
Wed Jan 20 07:42:58 PST 2016


As after setting private the mount is alone in its shared
group so setting master will silently fail as kernel can not
find any for our mount. (see do_make_slave)

https://jira.sw.ru/browse/PSBM-42829
Signed-off-by: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
---
 mount.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mount.c b/mount.c
index 56d732d..d3e6f76 100644
--- a/mount.c
+++ b/mount.c
@@ -2397,7 +2397,7 @@ static int do_bind_mount(struct mount_info *mi)
 	 * mi->shared_id && !shared - create a new shared group
 	 */
 	if (restore_shared_options(mi, force_private_remount
-					|| (!shared && !master && !mi->external),
+					|| (!shared && !mi->master_id && !mi->external),
 					mi->shared_id && !shared,
 					mi->master_id && !master))
 		return -1;
-- 
1.9.3



More information about the CRIU mailing list