[CRIU] [PATCH 05/11] mount: save the origin mount point path on restore

Pavel Emelyanov xemul at parallels.com
Mon Aug 4 03:36:30 PDT 2014


On 07/25/2014 01:12 AM, Andrey Vagin wrote:

What the "origin mount point" thing is?

> Signed-off-by: Andrey Vagin <avagin at openvz.org>
> ---
>  include/proc_parse.h | 1 +
>  mount.c              | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/include/proc_parse.h b/include/proc_parse.h
> index ff1ea5d..c2c3a65 100644
> --- a/include/proc_parse.h
> +++ b/include/proc_parse.h
> @@ -112,6 +112,7 @@ struct mount_info {
>  	 * a temporary copy.
>  	 */
>  	char		*mountpoint;
> +	int		rst_off;

Add comment about what this field is.

>  	unsigned	flags;
>  	int		master_id;
>  	int		shared_id;
> diff --git a/mount.c b/mount.c
> index d1f1f78..544a840 100644
> --- a/mount.c
> +++ b/mount.c
> @@ -1678,6 +1678,7 @@ static int collect_mnt_from_image(struct mount_info **pms, struct ns_id *nsid)
>  		pm->mountpoint = xmalloc(len);
>  		if (!pm->mountpoint)
>  			goto err;
> +		pm->rst_off = root_len;
>  		/*
>  		 * For bind-mounts we would also fix the root here
>  		 * too, but bind-mounts restore merges mountpoint
> 



More information about the CRIU mailing list