From 8b019e0bb41a0626055bd13154c0599ee94e03c7 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Fri, 8 Aug 2014 15:51:00 +0400 Subject: [PATCH] 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 Signed-off-by: Pavel Emelyanov --- mount.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mount.c b/mount.c index e0e88ea0e..60e14d1d0 100644 --- a/mount.c +++ b/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);