[CRIU] [PATCH 13/14] mount: use per-namespace mntinfo_tree

[Pavel Emelyanov]

On 04/17/2014 11:24 PM, Andrey Vagin wrote:
> This patch removes the global mntinfo_tree and collect_mount_info where
> it was constructed.

... and instead <write the text here>

> Signed-off-by: Andrey Vagin <avagin at openvz.org>

> @@ -81,6 +74,7 @@ int open_mount(unsigned int s_dev)
>  	return -ENOENT;
>  }
>  
> +<<<<<<< HEAD
>  int collect_mount_info(pid_t pid)
>  {
>  	pr_info("Collecting mountinfo\n");
> @@ -106,6 +100,8 @@ int collect_mount_info(pid_t pid)
>  	return 0;
>  }
>  
> +=======
> +>>>>>>> 37cd280... mount: use per-namespace mntinfo_tree
>  static struct mount_info *__lookup_mnt_id(struct mount_info *list, int id)

Nice hunks :)

>  {
>  	struct mount_info *m;