cr-dump: collect mount points in the target namespace

Information about mount points is used for dumping fanotify.
Signed-off-by: Andrey Vagin <avagin@openvz.org>
Acked-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

cr-dump.c

@@ -1570,7 +1570,7 @@ int cr_dump_tasks(pid_t pid, const struct cr_options *opts)
 	if (collect_file_locks(opts))
 		goto err;
 
-	if (collect_mount_info())
+	if (collect_mount_info(pid))
 		goto err;
 
 	if (mntns_collect_root(root_item->pid.real))

cr-restore.c

@@ -1091,7 +1091,7 @@ static int restore_task_with_children(void *_arg)
 
 	/* Restore root task */
 	if (current->parent == NULL) {
-		if (collect_mount_info())
+		if (collect_mount_info(getpid()))
 			exit(1);
 
 		if (prepare_namespace(current->pid.virt, ca->clone_flags))

include/mount.h

@@ -7,7 +7,7 @@ int mntns_collect_root(pid_t pid);
 struct proc_mountinfo;
 
 extern int open_mount(unsigned int s_dev);
-extern int collect_mount_info(void);
+extern int collect_mount_info(pid_t pid);
 extern struct fstype *find_fstype_by_name(char *fst);
 
 struct cr_fdset;

mount.c

@@ -37,11 +37,11 @@ int open_mount(unsigned int s_dev)
 	return -ENOENT;
 }
 
-int collect_mount_info(void)
+int collect_mount_info(pid_t pid)
 {
 	pr_info("Collecting mountinfo\n");
 
-	mntinfo = parse_mountinfo(getpid());
+	mntinfo = parse_mountinfo(pid);
 	if (!mntinfo) {
 		pr_err("Parsing mountinfo %d failed\n", getpid());
 		return -1;