[CRIU] [PATCH 3/3] proc-parse: Drop deleted postfix from the mountpoint root

Cyrill Gorcunov gorcunov at openvz.org
Mon Aug 10 01:34:27 PDT 2015


This address only a part of a problem with deleted mountpoint,
so rather a fast fix to not block development, but warning
issued to nag us to not forget resolve it before the release.

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 proc_parse.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/proc_parse.c b/proc_parse.c
index 00e2b7bc6d20..a8addcded1ea 100644
--- a/proc_parse.c
+++ b/proc_parse.c
@@ -1025,6 +1025,14 @@ static int parse_mountinfo_ent(char *str, struct mount_info *new, char **fsname)
 	cure_path(new->mountpoint);
 	cure_path(new->root);
 
+	/*
+	 * FIXME: Revisit and make a proper restore
+	 * of deleted roots. https://github.com/xemul/criu/issues/9
+	 * for details.
+	 */
+	if (strip_deleted(new->root))
+		pr_warn("Dropped postfix from the root");
+
 	new->mountpoint = xrealloc(new->mountpoint, strlen(new->mountpoint) + 1);
 	if (!new->mountpoint)
 		goto err;
-- 
2.4.3



More information about the CRIU mailing list