[CRIU] Fwd: Re: [PATCH 1/2] mount: Do not fail on shared cr-time mounts mismatch

[Pavel Emelyanov]

Applied

> commit be6c274ff58c6e685c122ead34e68ecdc59c5123
> Author: Kirill Tkhai <ktkhai at virtuozzo.com>
> Date:   Fri Sep 23 20:06:23 2016 +0300
> 
>     mount: Set opts.has_binfmt_misc regardless of mnt_ns level
>     
>     Since cr-time binfmt_misc is mounted regardless of mnt_ns
>     level, it's need just not to be over the system, make
>     parse method in consistent state with this behaviour.
>     
>     Signed-off-by: Kirill Tkhai <ktkhai at virtuozzo.com>
> 
> diff --git a/criu/mount.c b/criu/mount.c
> index f63be35..1519b25 100644
> --- a/criu/mount.c
> +++ b/criu/mount.c
> @@ -1339,8 +1339,7 @@ static int devtmpfs_restore(struct mount_info *pm)
>  
>  static int binfmt_misc_parse(struct mount_info *pm)
>  {
> -	if (pm->nsid->type == NS_ROOT)
> -		opts.has_binfmt_misc = true;
> +	opts.has_binfmt_misc = true;
>  	return 0;
>  
>  }
> .
>