[CRIU] [PATCH 4/7] mount: mnt_build_ids_tree -- Rework messages

Cyrill Gorcunov gorcunov at openvz.org
Thu Sep 3 03:05:11 PDT 2015


Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 mount.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/mount.c b/mount.c
index 56f410c9d905..ba4a0e370bae 100644
--- a/mount.c
+++ b/mount.c
@@ -339,13 +339,16 @@ static struct mount_info *mnt_build_ids_tree(struct mount_info *list)
 				continue;
 			}
 
-			pr_err("Mountpoint %d w/o parent %d found @%s (root %s)\n",
-					m->mnt_id, m->parent_mnt_id, m->mountpoint,
-					root ? "found" : "not found");
+			pr_debug("Mountpoint %d (@%s) w/o parent %d\n",
+				 m->mnt_id, m->mountpoint, m->parent_mnt_id);
+
 			if (root && m->is_ns_root) {
 				if (!mounts_equal(root, m, true) ||
-						strcmp(root->root, m->root)) {
-					pr_err("Nested mount namespaces with different roots are not supported yet");
+				    strcmp(root->root, m->root)) {
+					pr_err("Nested mount namespaces with different "
+					       "roots %d (@%s %s) %d (@%s %s) are not supported yet",
+					       root->mnt_id, root->mountpoint, root->root,
+					       m->mnt_id, m->mountpoint, m->root);
 					return NULL;
 				}
 
@@ -356,8 +359,15 @@ static struct mount_info *mnt_build_ids_tree(struct mount_info *list)
 				 * the main root.
 				 */
 				parent = tmp_root_mount;
-			} else
+
+				pr_debug("Mountpoint %d (@%s) get parent %d (@%s)\n",
+					 m->mnt_id, m->mountpoint,
+					 parent->mnt_id, parent->mountpoint);
+			} else {
+				pr_err("No root found for mountpoint %d (@%s)\n",
+					m->mnt_id, m->mountpoint);
 				return NULL;
+			}
 		}
 
 		m->parent = parent;
-- 
2.4.3



More information about the CRIU mailing list