From 7dfb905f31d69428c9e4b8d875380ef8a39d308d Mon Sep 17 00:00:00 2001
From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Tue, 2 Dec 2008 16:16:41 -0800
Subject: [PATCH] kclient: some logs revision

---
 src/kernel/addr.c       |  1 -
 src/kernel/caps.c       |  1 -
 src/kernel/ceph_debug.h | 24 ++++++++++++++++++------
 src/kernel/ceph_tools.c |  1 -
 src/kernel/dir.c        |  1 -
 src/kernel/export.c     |  1 -
 src/kernel/file.c       |  1 -
 src/kernel/inode.c      |  1 -
 src/kernel/ioctl.c      |  1 -
 src/kernel/mds_client.c |  1 -
 src/kernel/mdsmap.c     |  1 -
 src/kernel/messenger.c  |  1 -
 src/kernel/mon_client.c |  1 -
 src/kernel/osd_client.c |  1 -
 src/kernel/osdmap.c     |  1 -
 src/kernel/proc.c       |  1 -
 src/kernel/snap.c       |  1 -
 src/kernel/super.c      |  1 -
 18 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/kernel/addr.c b/src/kernel/addr.c
index 817fd617e8a61..7eb3980b1aebc 100644
--- a/src/kernel/addr.c
+++ b/src/kernel/addr.c
@@ -11,7 +11,6 @@
 int ceph_debug_addr = -1;
 #define DOUT_MASK DOUT_MASK_ADDR
 #define DOUT_VAR ceph_debug_addr
-#define DOUT_PREFIX "addr: "
 #include "super.h"
 
 #include "osd_client.h"
diff --git a/src/kernel/caps.c b/src/kernel/caps.c
index 02428d110d10c..9bbb38b10b8f0 100644
--- a/src/kernel/caps.c
+++ b/src/kernel/caps.c
@@ -8,7 +8,6 @@
 int ceph_debug_caps = -1;
 #define DOUT_MASK DOUT_MASK_CAPS
 #define DOUT_VAR ceph_debug_caps
-#define DOUT_PREFIX "caps: "
 #include "super.h"
 
 #include "decode.h"
diff --git a/src/kernel/ceph_debug.h b/src/kernel/ceph_debug.h
index 275fffa9cbfea..8df6505e4e522 100644
--- a/src/kernel/ceph_debug.h
+++ b/src/kernel/ceph_debug.h
@@ -92,23 +92,35 @@ static inline int ceph_get_debug_mask(char *name)
 	return 0;
 }
 
-#define dout_flag(x, mask, args...) do {				\
+#define _STRINGIFY(x) #x
+#define STRINGIFY(x) _STRINGIFY(x)
+
+#define FMT_PREFIX "%-30.30s: "
+#define FMT_SUFFIX "%s"
+#define LOG_ARGS __FILE__ ":" STRINGIFY(__LINE__)
+#define TRAIL_PARAM ""
+
+#define LOG_LINE FMT_PREFIX fmt, LOG_ARGS, args
+
+#define dout_flag(x, mask, fmt, args...) do {				\
 		if (((ceph_debug_mask | DOUT_UNMASKABLE) & mask) &&	\
 		    ((DOUT_VAR >= 0 && x <= DOUT_VAR) ||		\
 		     (DOUT_VAR < 0 && x <= ceph_debug))) {		\
 			if (ceph_debug_console)				\
-				printk(KERN_ERR "ceph_" DOUT_PREFIX args); \
+				printk(KERN_ERR FMT_PREFIX fmt, LOG_ARGS, args);	\
 			else						\
-				printk(KERN_DEBUG "ceph_" DOUT_PREFIX args); \
+				printk(KERN_DEBUG FMT_PREFIX fmt, LOG_ARGS, args);	\
 		}							\
 	} while (0)
 
-#define dout(x, args...) dout_flag(x, DOUT_MASK, args)
+#define _dout(x, fmt, args...) dout_flag(x, DOUT_MASK, fmt FMT_SUFFIX, args)
 
-#define derr(x, args...) do {			\
-		printk(KERN_ERR "ceph_" DOUT_PREFIX args);	\
+#define _derr(x, fmt, args...) do {					\
+		printk(KERN_ERR FMT_PREFIX fmt FMT_SUFFIX, LOG_ARGS, args);	\
 	} while (0)
 
+#define dout(x, args...) _dout(x, args, TRAIL_PARAM)
+#define derr(x, args...) _derr(x, args, TRAIL_PARAM)
 
 /* dcache d_count debugging */
 #if 0
diff --git a/src/kernel/ceph_tools.c b/src/kernel/ceph_tools.c
index 9994af6bccdf2..249b347fe288e 100644
--- a/src/kernel/ceph_tools.c
+++ b/src/kernel/ceph_tools.c
@@ -11,7 +11,6 @@
 int ceph_debug_tools = -1;
 #define DOUT_VAR ceph_debug_tools
 #define DOUT_MASK DOUT_MASK_TOOLS
-#define DOUT_PREFIX "tools: "
 #include "super.h"
 
 static struct list_head _bk_allocs;
diff --git a/src/kernel/dir.c b/src/kernel/dir.c
index 04c106484ff7e..c0d47c632932f 100644
--- a/src/kernel/dir.c
+++ b/src/kernel/dir.c
@@ -6,7 +6,6 @@
 int ceph_debug_dir = -1;
 #define DOUT_MASK DOUT_MASK_DIR
 #define DOUT_VAR ceph_debug_dir
-#define DOUT_PREFIX "dir: "
 #include "super.h"
 
 /*
diff --git a/src/kernel/export.c b/src/kernel/export.c
index 78c569982920e..fe8b0bd507f59 100644
--- a/src/kernel/export.c
+++ b/src/kernel/export.c
@@ -6,7 +6,6 @@
 int ceph_debug_export = -1;
 #define DOUT_MASK DOUT_MASK_EXPORT
 #define DOUT_VAR ceph_debug_export
-#define DOUT_PREFIX "export: "
 
 /*
  * fh is N tuples of
diff --git a/src/kernel/file.c b/src/kernel/file.c
index c366cdb486829..8c7a1df1b070c 100644
--- a/src/kernel/file.c
+++ b/src/kernel/file.c
@@ -8,7 +8,6 @@
 int ceph_debug_file = -1;
 #define DOUT_MASK DOUT_MASK_FILE
 #define DOUT_VAR ceph_debug_file
-#define DOUT_PREFIX "file: "
 #include "super.h"
 
 #include "mds_client.h"
diff --git a/src/kernel/inode.c b/src/kernel/inode.c
index 8f644cdddb512..368e4ce1520f1 100644
--- a/src/kernel/inode.c
+++ b/src/kernel/inode.c
@@ -13,7 +13,6 @@
 int ceph_debug_inode = -1;
 #define DOUT_MASK DOUT_MASK_INODE
 #define DOUT_VAR ceph_debug_inode
-#define DOUT_PREFIX "inode: "
 #include "super.h"
 #include "decode.h"
 
diff --git a/src/kernel/ioctl.c b/src/kernel/ioctl.c
index ccbd0d679a281..927907ca73679 100644
--- a/src/kernel/ioctl.c
+++ b/src/kernel/ioctl.c
@@ -5,7 +5,6 @@
 int ceph_debug_ioctl = -1;
 #define DOUT_MASK DOUT_MASK_IOCTL
 #define DOUT_VAR ceph_debug_ioctl
-#define DOUT_PREFIX "ioctl: "
 
 
 /*
diff --git a/src/kernel/mds_client.c b/src/kernel/mds_client.c
index 66265d6ba1b59..18de0462fe081 100644
--- a/src/kernel/mds_client.c
+++ b/src/kernel/mds_client.c
@@ -9,7 +9,6 @@
 int ceph_debug_mdsc = -1;
 #define DOUT_VAR ceph_debug_mdsc
 #define DOUT_MASK DOUT_MASK_MDSC
-#define DOUT_PREFIX "mds: "
 #include "super.h"
 #include "messenger.h"
 #include "decode.h"
diff --git a/src/kernel/mdsmap.c b/src/kernel/mdsmap.c
index 7d00456b887af..e55c0c06f6712 100644
--- a/src/kernel/mdsmap.c
+++ b/src/kernel/mdsmap.c
@@ -13,7 +13,6 @@
 int ceph_debug_mdsmap = -1;
 #define DOUT_MASK DOUT_MASK_MDSMAP
 #define DOUT_VAR ceph_debug_mdsmap
-#define DOUT_PREFIX "mdsmap: "
 #include "super.h"
 
 
diff --git a/src/kernel/messenger.c b/src/kernel/messenger.c
index d1aed235cf151..0bfa440637074 100644
--- a/src/kernel/messenger.c
+++ b/src/kernel/messenger.c
@@ -11,7 +11,6 @@
 int ceph_debug_msgr;
 #define DOUT_MASK DOUT_MASK_MSGR
 #define DOUT_VAR ceph_debug_msgr
-#define DOUT_PREFIX "msgr: "
 
 #include "super.h"
 #include "messenger.h"
diff --git a/src/kernel/mon_client.c b/src/kernel/mon_client.c
index 118cb7edcf3bd..de255f0c944a6 100644
--- a/src/kernel/mon_client.c
+++ b/src/kernel/mon_client.c
@@ -9,7 +9,6 @@
 int ceph_debug_mon = -1;
 #define DOUT_MASK DOUT_MASK_MON
 #define DOUT_VAR ceph_debug_mon
-#define DOUT_PREFIX "mon: "
 #include "super.h"
 #include "decode.h"
 
diff --git a/src/kernel/osd_client.c b/src/kernel/osd_client.c
index 35b1259565586..6beb88855eb57 100644
--- a/src/kernel/osd_client.c
+++ b/src/kernel/osd_client.c
@@ -10,7 +10,6 @@
 int ceph_debug_osdc = -1;
 #define DOUT_MASK DOUT_MASK_OSDC
 #define DOUT_VAR ceph_debug_osdc
-#define DOUT_PREFIX "osdc: "
 #include "super.h"
 
 #include "osd_client.h"
diff --git a/src/kernel/osdmap.c b/src/kernel/osdmap.c
index 5e3b84591069d..e41b9222d4874 100644
--- a/src/kernel/osdmap.c
+++ b/src/kernel/osdmap.c
@@ -11,7 +11,6 @@
 int ceph_debug_osdmap = -1;
 #define DOUT_MASK DOUT_MASK_OSDMAP
 #define DOUT_VAR ceph_debug_osdmap
-#define DOUT_PREFIX "osdmap: "
 
 /* maps */
 
diff --git a/src/kernel/proc.c b/src/kernel/proc.c
index 2ec01eab2f478..9838f6a51cc31 100644
--- a/src/kernel/proc.c
+++ b/src/kernel/proc.c
@@ -8,7 +8,6 @@
 int ceph_debug_proc = -1;
 #define DOUT_MASK DOUT_MASK_PROC
 #define DOUT_VAR ceph_debug_proc
-#define DOUT_PREFIX "proc: "
 
 #include "super.h"
 
diff --git a/src/kernel/snap.c b/src/kernel/snap.c
index 5a52908efff3c..342af555e3e55 100644
--- a/src/kernel/snap.c
+++ b/src/kernel/snap.c
@@ -7,7 +7,6 @@
 int ceph_debug_snap = -1;
 #define DOUT_MASK DOUT_MASK_SNAP
 #define DOUT_VAR ceph_debug_snap
-#define DOUT_PREFIX "snap: "
 
 #include "super.h"
 #include "decode.h"
diff --git a/src/kernel/super.c b/src/kernel/super.c
index 235c091ad6852..3b77aba69e9b8 100644
--- a/src/kernel/super.c
+++ b/src/kernel/super.c
@@ -29,7 +29,6 @@ int ceph_debug_super = -1;   /* for this file */
 
 #define DOUT_MASK DOUT_MASK_SUPER
 #define DOUT_VAR ceph_debug_super
-#define DOUT_PREFIX "super: "
 #include "super.h"
 
 #include "mon_client.h"
-- 
2.39.5