kclient: redo debug level handling

diff --git a/src/kernel/addr.c b/src/kernel/addr.c
index 1cc7a2ecef25fcaef141071cfa1dd2f98598eac1..80abf6ed0cf29129809c4fb5b637d1effa838745 100644 (file)
--- a/src/kernel/addr.c
+++ b/src/kernel/addr.c
@@ -4,7 +4,7 @@
 #include <linux/pagemap.h>
 #include <linux/writeback.h>   /* generic_writepages */
 
-int ceph_debug_addr = 50;
+int ceph_debug_addr = -1;
 #define DOUT_VAR ceph_debug_addr
 #define DOUT_PREFIX "addr: "
 #include "super.h"

diff --git a/src/kernel/client.c b/src/kernel/client.c
index a549a4350952a003f71d5ac29c85f32021eedd5d..0e7e764c78f6231fbca4a35f2b0dc7db51d24c88 100644 (file)
--- a/src/kernel/client.c
+++ b/src/kernel/client.c
@@ -6,8 +6,8 @@
 #include <linux/fs.h>
 #include <linux/mount.h>
 
-int ceph_client_debug = 50;
-#define DOUT_VAR ceph_client_debug
+int ceph_debug_client = -1;
+#define DOUT_VAR ceph_debug_client
 #define DOUT_PREFIX "client: "
 #include "super.h"
 #include "ktcp.h"

diff --git a/src/kernel/file.c b/src/kernel/file.c
index 3831a6245d965d597bb3a24d3da12fedf2127e11..09c806e1d4dcf8c1c43aaac71aec9c5f361ea2f3 100644 (file)
--- a/src/kernel/file.c
+++ b/src/kernel/file.c
@@ -2,7 +2,7 @@
 #include <linux/sched.h>
 #include <linux/file.h>
 
-int ceph_debug_file = 50;
+int ceph_debug_file = -1;
 #define DOUT_VAR ceph_debug_file
 #define DOUT_PREFIX "file: "
 #include "super.h"

diff --git a/src/kernel/inode.c b/src/kernel/inode.c
index fac8686bbc4353fb8f1a24de2a74a0073a5e2bbb..40388fc6a4252f781edfc53603a8166368c8f363 100644 (file)
--- a/src/kernel/inode.c
+++ b/src/kernel/inode.c
@@ -8,8 +8,8 @@
 #include <linux/ceph_fs.h>
 #include <linux/namei.h>
 
-int ceph_inode_debug = 50;
-#define DOUT_VAR ceph_inode_debug
+int ceph_debug_inode = -1;
+#define DOUT_VAR ceph_debug_inode
 #define DOUT_PREFIX "inode: "
 #include "super.h"
 #include "decode.h"

diff --git a/src/kernel/ktcp.c b/src/kernel/ktcp.c
index 56c5dd22c50d7fa0b21f20285ab1f5e97603912e..172a927471cde93b9d298fe3e42ac87884df573e 100644 (file)
--- a/src/kernel/ktcp.c
+++ b/src/kernel/ktcp.c
@@ -5,7 +5,7 @@
 #include "messenger.h"
 #include "ktcp.h"
 
-int ceph_debug_tcp = 1;
+int ceph_debug_tcp = -1;
 #define DOUT_VAR ceph_debug_tcp
 #define DOUT_PREFIX "tcp: "
 #include "super.h"

diff --git a/src/kernel/mds_client.c b/src/kernel/mds_client.c
index 6ad34264b21dd4e7bb7266937eaff6ba6b82942e..2a9c9cf7f10b9bb0028bff4908ed2088b105bdb0 100644 (file)
--- a/src/kernel/mds_client.c
+++ b/src/kernel/mds_client.c
@@ -5,7 +5,7 @@
 #include "mds_client.h"
 #include "mon_client.h"
 
-int ceph_debug_mdsc = 50;
+int ceph_debug_mdsc = -1;
 #define DOUT_VAR ceph_debug_mdsc
 #define DOUT_PREFIX "mds: "
 #include "super.h"

diff --git a/src/kernel/mdsmap.c b/src/kernel/mdsmap.c
index 6feb35501c29f21c35efdbdd26416217c272acfe..9b0a43692a20fbf5e09645fac9742a4304a46a20 100644 (file)
--- a/src/kernel/mdsmap.c
+++ b/src/kernel/mdsmap.c
@@ -8,8 +8,8 @@
 #include "messenger.h"
 #include "decode.h"
 
-int ceph_mdsmap_debug = 50;
-#define DOUT_VAR ceph_mdsmap_debug
+int ceph_debug_mdsmap = -1;
+#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 a4f02fa756c5b9508015ce3a2d08a620293d3487..ae120de7cef7aeca4a2374d07a3072bf3a93eb58 100644 (file)
--- a/src/kernel/messenger.c
+++ b/src/kernel/messenger.c
@@ -8,7 +8,7 @@
 #include "messenger.h"
 #include "ktcp.h"
 
-int ceph_debug_msgr = 50;
+int ceph_debug_msgr = -1;
 #define DOUT_VAR ceph_debug_msgr
 #define DOUT_PREFIX "msgr: "
 #include "super.h"

diff --git a/src/kernel/mon_client.c b/src/kernel/mon_client.c
index b13df90c1b559248628ff18c50acac2682f72e68..e60aee933bb5b9b3de8af24e7bc525ce7831ec56 100644 (file)
--- a/src/kernel/mon_client.c
+++ b/src/kernel/mon_client.c
@@ -3,8 +3,8 @@
 #include <linux/random.h>
 #include "mon_client.h"
 
-int ceph_mon_debug = 50;
-#define DOUT_VAR ceph_mon_debug
+int ceph_debug_mon = -1;
+#define DOUT_VAR ceph_debug_mon
 #define DOUT_PREFIX "mon: "
 #include "super.h"
 

diff --git a/src/kernel/osd_client.c b/src/kernel/osd_client.c
index 9b74ddccdb8e49b1d2a7d83be892c6c2e5d1dbfb..f4b760c9d9ede0025f7eb5f8f7cda39643d2b958 100644 (file)
--- a/src/kernel/osd_client.c
+++ b/src/kernel/osd_client.c
@@ -5,7 +5,7 @@
 #include <linux/highmem.h>     /* kmap, kunmap */
 #include <linux/pagemap.h>     /* read_cache_pages */
 
-int ceph_debug_osdc = 50;
+int ceph_debug_osdc = -1;
 #define DOUT_VAR ceph_debug_osdc
 #define DOUT_PREFIX "osdc: "
 #include "super.h"

diff --git a/src/kernel/osdmap.c b/src/kernel/osdmap.c
index 4ef7b433e7faf40fd5e9ddf14d86cd323ebeea9f..997067e6f4f3bd9f5bcbbd947215c4a67e545ad4 100644 (file)
--- a/src/kernel/osdmap.c
+++ b/src/kernel/osdmap.c
@@ -1,8 +1,8 @@
 
 #include <asm/div64.h>
 
-int ceph_osdmap_debug = 50;
-#define DOUT_VAR ceph_osdmap_debug
+int ceph_debug_osdmap = -1;
+#define DOUT_VAR ceph_debug_osdmap
 #define DOUT_PREFIX "osdmap: "
 #include "super.h"
 

diff --git a/src/kernel/super.c b/src/kernel/super.c
index a32ab1b244c8acd6c0cc9c54f2faa8a646a55b9a..1052a933d0df62258f2cff4fd88ae2dab19be422 100644 (file)
--- a/src/kernel/super.c
+++ b/src/kernel/super.c
@@ -8,11 +8,17 @@
 
 /* debug levels; defined in super.h */
 
-/* global value.  0 = quiet, -1 == use per-file levels */
+/*
+ * global debug value.  
+ *  0 = quiet. 
+ *
+ * if the per-file debug level >= 0, then that overrides this  global
+ * debug level.
+ */
 int ceph_debug = 0;
 
 /* for this file */
-int ceph_debug_super = 50;
+int ceph_debug_super = -1;
 
 #define DOUT_VAR ceph_debug_super
 #define DOUT_PREFIX "super: "

diff --git a/src/kernel/super.h b/src/kernel/super.h
index 370325123515e5507c67b648c25b59d308cc08e9..dfc525f4b8698fde8a05ac4f5af97e74fa98b5e8 100644 (file)
--- a/src/kernel/super.h
+++ b/src/kernel/super.h
@@ -22,8 +22,8 @@ extern int ceph_debug_addr;
 #define CEPH_DUMP_ERROR_ALWAYS
 
 #define dout(x, args...) do {                                          \
-               if ((ceph_debug >= 0 && x <= ceph_debug) ||             \
-                   (ceph_debug < 0 && x <= DOUT_VAR))                  \
+               if ((DOUT_VAR >= 0 && x <= DOUT_VAR) ||                 \
+                   (DOUT_VAR < 0 && x <= ceph_debug))                  \
                        printk(KERN_INFO "ceph_" DOUT_PREFIX args);     \
        } while (0)
 
@@ -33,8 +33,8 @@ extern int ceph_debug_addr;
        } while (0)
 #else
 #define derr(x, args...) do {                                          \
-               if ((ceph_debug >= 0 && x <= ceph_debug) ||             \
-                   (ceph_debug < 0 && x <= DOUT_VAR))                  \
+               if ((DOUT_VAR >= 0 && x <= DOUT_VAR) ||                 \
+                   (DOUT_VAR < 0 && x <= ceph_debug))                  \
                        printk(KERN_ERR "ceph_" DOUT_PREFIX args);      \
        } while (0)
 #endif