kclient: simple dout macro by default

diff --git a/src/kernel/Kconfig b/src/kernel/Kconfig
index 32090d3f547394c7051c642671b30534f7d1dd4d..bc1fbd95618722dca4b7486498dd1253c7c7d027 100644 (file)
--- a/src/kernel/Kconfig
+++ b/src/kernel/Kconfig
@@ -12,3 +12,15 @@ config CEPH_FS
 
          If unsure, say N.
 
+config CEPH_FS_PRETTYDEBUG
+       bool "Include file:line in ceph debug output"
+       depends on CEPH_FS
+       default n
+       help
+         If you say Y here, debug output will include a filename and
+         line to aid debugging.  This icnreases kernel size and slows
+         execution slightly when debug call sites are enabled (e.g.,
+         via CONFIG_DYNAMIC_DEBUG).
+
+         If unsure, say N.
+

diff --git a/src/kernel/ceph_debug.h b/src/kernel/ceph_debug.h
index 69404ac8dc90b4012c2c88ef79be1a43045caba2..da473e38a67ab9f9c9634e425c4bead4c269997e 100644 (file)
--- a/src/kernel/ceph_debug.h
+++ b/src/kernel/ceph_debug.h
@@ -1,24 +1,34 @@
 #ifndef _FS_CEPH_DEBUG_H
 #define _FS_CEPH_DEBUG_H
 
+#ifdef CONFIG_CEPH_FS_PRETTYDEBUG
+
 /*
- * wrap pr_debug to include a filename:lineno prefix on each line
+ * wrap pr_debug to include a filename:lineno prefix on each line.
+ * this incurs some overhead (kernel size and execution time) due to
+ * the extra function call at each call site.
  */
 
-#if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)
+# if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)
 extern const char *ceph_file_part(const char *s, int len);
-# define dout(fmt, ...)                                                        \
+#  define dout(fmt, ...)                                               \
        pr_debug(" %12.12s:%-4d : " fmt,                                \
                 ceph_file_part(__FILE__, sizeof(__FILE__)),            \
                 __LINE__, ##__VA_ARGS__);
+# else
+/* faux printk call just to see any compiler warnings. */
+#  define dout(fmt, ...)       do {                            \
+               if (0) printk(KERN_DEBUG fmt, ##__VA_ARGS__);   \
+       } while (0)
+# endif
+
 #else
+
 /*
- * this is a no-op, but keep the faux printk call just so we see any
- * compiler warnings.
+ * or, just wrap pr_debug
  */
-# define dout(fmt, ...)        do {                                            \
-               if (0) printk(KERN_DEBUG fmt, ##__VA_ARGS__);   \
-       } while (0)
+# define dout(fmt, ...)        pr_debug(" " fmt, ##__VA_ARGS__)
+
 #endif
 
 #endif