mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-29 21:38:16 +00:00
Code Issues Releases Wiki Activity

mnt: Don't delay external mount points

Browse Source 
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:
Pavel Emelyanov 2014-08-08 15:51:00 +04:00
parent 59dae2372a
commit 8b019e0bb4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mount.c
View File

@ -1380,9 +1380,9 @@ static bool can_mount_now(struct mount_info *mi)
/* /*
* Other mounts can be mounted only if they have * Other mounts can be mounted only if they have
* the master mount (see propagate_mount) or if we * 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 true;
return false; return false;
@ -1415,7 +1415,7 @@ static int do_mount_one(struct mount_info *mi)
if (!mi->parent) if (!mi->parent)
ret = do_mount_root(mi); 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); ret = do_new_mount(mi);
else else
ret = do_bind_mount(mi); ret = do_bind_mount(mi);