[CRIU] [PATCH 4/5] kill the awful check before mntinfo_add_list() in collect_mntns()

Oleg Nesterov oleg at redhat.com
Tue Apr 14 09:54:11 PDT 2015


This check was added by commit aebfabb5 "mnt: add --ext-mount-map
auto option", but unless I am totally confused it actually belongs
to the (already reverted) 246367e4e483 "add walk_all flag to
walk_namespaces".

Remove it. It is no longer needed and it was very unobvious.

Signed-off-by: Oleg Nesterov <oleg at redhat.com>
---
 mount.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/mount.c b/mount.c
index 8250154..78bb855 100644
--- a/mount.c
+++ b/mount.c
@@ -2665,8 +2665,7 @@ static int collect_mntns(struct ns_id *ns, void *__arg)
 	if (arg->for_dump && ns->pid != getpid())
 		arg->need_to_validate = true;
 
-	if (ns->pid != getpid() || !(root_ns_mask & CLONE_NEWNS))
-		mntinfo_add_list(pms);
+	mntinfo_add_list(pms);
 	return 0;
 }
 
-- 
1.5.5.1



More information about the CRIU mailing list