[v2,3/5] mount: save ext_real_root for external mounts

Submitted by Pavel Tikhomirov on March 2, 2017, 7:34 a.m.

Details

Message ID 20170302073433.13610-1-ptikhomirov@virtuozzo.com
State New
Series "mount: handle external mount bindmounts"
Headers show

Commit Message

Pavel Tikhomirov March 2, 2017, 7:34 a.m.
https://jira.sw.ru/browse/PSBM-46753

v2: s/real_root/ext_real_root/
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
---
 criu/mount.c     | 3 ++-
 images/mnt.proto | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/criu/mount.c b/criu/mount.c
index f5835d3..a8716c5 100644
--- a/criu/mount.c
+++ b/criu/mount.c
@@ -1306,6 +1306,7 @@  static int dump_one_mountpoint(struct mount_info *pm, struct cr_img *img)
 		 * for reverse mapping details.
 		 */
 		me.root	= pm->external;
+		me.ext_real_root = pm->root;
 		me.has_ext_mount = true;
 		me.ext_mount = true;
 	} else
@@ -2416,7 +2417,7 @@  static int get_mp_root(MntEntry *me, struct mount_info *mi)
 {
 	char *ext = NULL;
 
-	mi->root = xstrdup(me->root);
+	mi->root = xstrdup(me->ext_real_root ? : me->root);
 	if (!mi->root)
 		return -1;
 
diff --git a/images/mnt.proto b/images/mnt.proto
index 50cd8af..3294319 100644
--- a/images/mnt.proto
+++ b/images/mnt.proto
@@ -53,4 +53,5 @@  message mnt_entry {
 
 	optional bool		deleted			= 16;
 	optional uint32		sb_flags		= 17 [(criu).hex = true];
+	optional string		ext_real_root		= 18;
 }