Revert "mnt: Merge two calls to collect_mntinfo on early restore"

This reverts commit f55a0b91.

The collected mounts list a) points to nsid and b) should be
put on nsid's mntinfo_tree. Thus is _should_ be done by separate
calls.

mount.c

@@ -1419,7 +1419,7 @@ static int create_mnt_roots(void)
 	return 0;
 }
 
-static int rst_collect_local_mntns(struct mount_info *mi)
+static int rst_collect_local_mntns(void)
 {
 	struct ns_id *nsid;
 
@@ -1432,11 +1432,14 @@ static int rst_collect_local_mntns(struct mount_info *mi)
 	nsid->pid = getpid();
 	futex_set(&nsid->created, 1);
 
-	mntinfo = mi;
+	mntinfo = collect_mntinfo(nsid);
+	if (mntinfo == NULL)
+		return -1;
+
 	nsid->next = ns_ids;
 	ns_ids = nsid;
 
-	pr_info("Add local mntns %d pid %d\n", nsid->id, nsid->pid);
+	pr_info("Add namespace %d pid %d\n", nsid->id, nsid->pid);
 
 	return 0;
 }
@@ -1725,15 +1728,15 @@ int prepare_mnt_ns(void)
 	struct mount_info *mis, *old;
 	struct ns_id ns = { .pid = getpid(), .nd = &mnt_ns_desc };
 
-	old = collect_mntinfo(&ns);
-	if (old == NULL)
-		return -1;
-
 	if (!(root_ns_mask & CLONE_NEWNS))
-		return rst_collect_local_mntns(old);
+		return rst_collect_local_mntns();
 
 	pr_info("Restoring mount namespace\n");
 
+	old = collect_mntinfo(&ns);
+	if (old == NULL)
+		return -1;
+
 	close_proc();
 
 	mis = read_mnt_ns_img();