[CRIU] [PATCH 1/2] Don't say /proc in macro errors

[Christopher Covington]

It's possible that a procfs mounted somewhere other than /proc
is in use.

Signed-off-by: Christopher Covington <cov at codeaurora.org>
---
 include/util.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/util.h b/include/util.h
index d4e3e3d..c4b8e69 100644
--- a/include/util.h
+++ b/include/util.h
@@ -132,15 +132,15 @@ extern int set_proc_fd(int fd);
 
 extern int do_open_proc(pid_t pid, int flags, const char *fmt, ...);
 
-#define __open_proc(pid, flags, fmt, ...)			\
-	({							\
-		int __fd = do_open_proc(pid, flags,		\
-					fmt, ##__VA_ARGS__);	\
-		if (__fd < 0)					\
-			pr_perror("Can't open /proc/%d/" fmt,	\
-					pid, ##__VA_ARGS__);	\
-								\
-		__fd;						\
+#define __open_proc(pid, flags, fmt, ...)				\
+	({								\
+		int __fd = do_open_proc(pid, flags,			\
+					fmt, ##__VA_ARGS__);		\
+		if (__fd < 0)						\
+			pr_perror("Can't open %d/" fmt " on procfs",	\
+					pid, ##__VA_ARGS__);		\
+									\
+		__fd;							\
 	})
 
 /* int open_proc(pid_t pid, const char *fmt, ...); */
@@ -161,7 +161,7 @@ extern int do_open_proc(pid_t pid, int flags, const char *fmt, ...);
 			__d = fdopendir(__fd);				\
 			if (__d == NULL)				\
 				pr_perror("Can't fdopendir %d "		\
-					"(/proc/%d/" fmt ")",		\
+					"(%d/" fmt " on procfs)",	\
 					__fd, pid, ##__VA_ARGS__);	\
 		}							\
 		__d;							\
@@ -177,7 +177,7 @@ extern int do_open_proc(pid_t pid, int flags, const char *fmt, ...);
 			__f = fdopen(__fd, "r");			\
 			if (__f == NULL)				\
 				pr_perror("Can't fdopen %d "		\
-					"(/proc/%d/" fmt ")",		\
+					"(%d/" fmt " on procfs)",	\
 					__fd, pid, ##__VA_ARGS__);	\
 		}							\
 		__f;							\
-- 
Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by the Linux Foundation.