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

[Kirill Tkhai]

Forgot one more piece (see my reply to original series). Please, apply.


-------- Forwarded Message --------
Subject: Re: [PATCH 1/2] mount: Do not fail on shared cr-time mounts mismatch
Date: Fri, 23 Sep 2016 20:17:01 +0300
From: Kirill Tkhai <ktkhai at virtuozzo.com>
To: criu at openvz.org

Below is leftover for this series. Could be merged with [2/2].

On 23.09.2016 19:47, Kirill Tkhai wrote:
> Since cr-time mount parent may be shared, and we do
> not propagate the mount there, this patch excludes
> them from validation.
> 
> https://jira.sw.ru/browse/PSBM-52513
> 
> Signed-off-by: Kirill Tkhai <ktkhai at virtuozzo.com>

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;
 
 }