From: Sage Weil <sage@newdream.net>
Date: Thu, 16 Jul 2009 20:39:48 +0000 (-0700)
Subject: kclient: make dout() behave despite file prefix, cleanup
X-Git-Tag: v0.11~88
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=869af81a8bb23f7800e78da20ade36ca71a0cbe5;p=ceph.git

kclient: make dout() behave despite file prefix, cleanup
---

diff --git a/src/kernel/ceph_debug.h b/src/kernel/ceph_debug.h
index 0510b08c5550..a1a5107c2c26 100644
--- a/src/kernel/ceph_debug.h
+++ b/src/kernel/ceph_debug.h
@@ -1,19 +1,23 @@
 #ifndef _FS_CEPH_DEBUG_H
 #define _FS_CEPH_DEBUG_H
 
-#include <linux/string.h>
+/*
+ * wrap pr_debug to include a filename:lineno prefix on each line
+ */
 
-#define _STRINGIFY(x) #x
-#define STRINGIFY(x) _STRINGIFY(x)
+static inline const char *ceph_file_part(const char *s, int len)
+{
+	const char *e = s + len;
 
-#define FMT_PREFIX " %12.12s:%-4d : "
-#define FMT_SUFFIX "%s"
-#define LOG_ARGS __FILE__ + 8, __LINE__  /* strip of fs/ceph/ from __FILE__ */
-#define TRAIL_PARAM ""
+	while (*(e-1) != '/')
+		e--;
+	return e;
+}
 
-#define LOG_LINE FMT_PREFIX fmt, LOG_ARGS, args
-
-#define _dout(fmt, args...) pr_debug(FMT_PREFIX fmt FMT_SUFFIX, LOG_ARGS, args);
-#define dout(args...) _dout(args, TRAIL_PARAM)
+#define _dout(fmt, args...)						\
+	pr_debug(" %12.12s:%-4d : " fmt "%s",				\
+		 ceph_file_part(__FILE__, sizeof(__FILE__)), __LINE__,	\
+		 args);
+#define dout(args...) _dout(args, "")
 
 #endif
diff --git a/src/kernel/super.c b/src/kernel/super.c
index d68a6905bbeb..4805e3e4fb0f 100644
--- a/src/kernel/super.c
+++ b/src/kernel/super.c
@@ -1108,6 +1108,9 @@ static struct file_system_type ceph_fs_type = {
 	.fs_flags	= FS_RENAME_DOES_D_MOVE,
 };
 
+#define _STRINGIFY(x) #x
+#define STRINGIFY(x) _STRINGIFY(x)
+
 static int __init init_ceph(void)
 {
 	int ret = 0;