mirror of
https://github.com/checkpoint-restore/criu
synced 2025-08-29 13:28:27 +00:00
mnt: Don't delay external mount points
It looks like criu constantly postpones external bind mounts. I'm trying to resolve when we manage to break this (when I did ext-mount-map they for some reason didn't). Meanwhile, this patch fixes it back. Reported-by: Saied Kazemi <saied@google.com> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
parent
59dae2372a
commit
8b019e0bb4
6
mount.c
6
mount.c
@ -1380,9 +1380,9 @@ static bool can_mount_now(struct mount_info *mi)
|
||||
/*
|
||||
* Other mounts can be mounted only if they have
|
||||
* the master mount (see propagate_mount) or if we
|
||||
* expect a plugin to help us.
|
||||
* expect a plugin/ext-mount-map to help us.
|
||||
*/
|
||||
if (mi->bind || mi->need_plugin)
|
||||
if (mi->bind || mi->need_plugin || mi->external)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
@ -1415,7 +1415,7 @@ static int do_mount_one(struct mount_info *mi)
|
||||
|
||||
if (!mi->parent)
|
||||
ret = do_mount_root(mi);
|
||||
else if (!mi->bind && !mi->need_plugin)
|
||||
else if (!mi->bind && !mi->need_plugin && !mi->external)
|
||||
ret = do_new_mount(mi);
|
||||
else
|
||||
ret = do_bind_mount(mi);
|
||||
|
Loading…
x
Reference in New Issue
Block a user