Commit e22aaf7f authored by Andrew Vagin's avatar Andrew Vagin Committed by Pavel Emelyanov

mount: master_id should be 0 for new mounts

v2: add a comment before calling BUG_ON(mi->master_id)
Signed-off-by: 's avatarAndrew Vagin <avagin@virtuozzo.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent cfc267a2
......@@ -2259,9 +2259,12 @@ 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))
/*
* A slave should be mounted from do_bind_mount().
* Look at can_mount_now() for details.
*/
BUG_ON(mi->master_id);
if (restore_shared_options(mi, !mi->shared_id, mi->shared_id, 0))
return -1;
mi->mounted = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment