safe_mount: safe_umount: print debug info about the operation

Make the source and the target to mount/umount visible. It's good for debugging. Suggested-by: Martin Doucha <[email protected]> Signed-off-by: Murphy Zhou <[email protected]> Reviewed-by: Li Wang <[email protected]>
linux-test-project · Jun 16, 2023 · 3490c28 · 3490c28
1 parent 97c2fdb
commit 3490c28
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/lib/safe_macros.c b/lib/safe_macros.c
@@ -898,7 +898,16 @@ int safe_mount(const char *file, const int lineno, void (*cleanup_fn)(void),
 	       const void *data)
 {
 	int rval = -1;
+	char mpath[PATH_MAX];
 
+	if (realpath(target, mpath)) {
+		tst_resm_(file, lineno, TINFO,
+			"Mounting %s to %s fstyp=%s flags=%lx",
+			source, mpath, filesystemtype, mountflags);
+	} else {
+		tst_brkm_(file, lineno, TBROK | TERRNO, cleanup_fn,
+			"Cannot resolve the absolute path of %s", target);
+	}
 	/*
 	 * Don't try using the kernel's NTFS driver when mounting NTFS, since
 	 * the kernel's NTFS driver doesn't have proper write support.
@@ -948,6 +957,14 @@ int safe_umount(const char *file, const int lineno, void (*cleanup_fn)(void),
 		const char *target)
 {
 	int rval;
+	char mpath[PATH_MAX];
+
+	if (realpath(target, mpath)) {
+		tst_resm_(file, lineno, TINFO, "Umounting %s", mpath);
+	} else {
+		tst_brkm_(file, lineno, TBROK | TERRNO, cleanup_fn,
+			"Cannot resolve the absolute path of %s", target);
+	}
 
 	rval = tst_umount(target);