From: Sage Weil Date: Thu, 3 Apr 2008 17:45:18 +0000 (-0700) Subject: kclient: redo debug level handling X-Git-Tag: v0.2~212^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=858372a48baf94923775587ec606505ab70ef4f0;p=ceph.git kclient: redo debug level handling --- diff --git a/src/kernel/addr.c b/src/kernel/addr.c index 1cc7a2ecef2..80abf6ed0cf 100644 --- a/src/kernel/addr.c +++ b/src/kernel/addr.c @@ -4,7 +4,7 @@ #include #include /* 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 a549a435095..0e7e764c78f 100644 --- a/src/kernel/client.c +++ b/src/kernel/client.c @@ -6,8 +6,8 @@ #include #include -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 3831a6245d9..09c806e1d4d 100644 --- a/src/kernel/file.c +++ b/src/kernel/file.c @@ -2,7 +2,7 @@ #include #include -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 fac8686bbc4..40388fc6a42 100644 --- a/src/kernel/inode.c +++ b/src/kernel/inode.c @@ -8,8 +8,8 @@ #include #include -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 56c5dd22c50..172a927471c 100644 --- 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 6ad34264b21..2a9c9cf7f10 100644 --- 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 6feb35501c2..9b0a43692a2 100644 --- 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 a4f02fa756c..ae120de7cef 100644 --- 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 b13df90c1b5..e60aee933bb 100644 --- a/src/kernel/mon_client.c +++ b/src/kernel/mon_client.c @@ -3,8 +3,8 @@ #include #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 9b74ddccdb8..f4b760c9d9e 100644 --- a/src/kernel/osd_client.c +++ b/src/kernel/osd_client.c @@ -5,7 +5,7 @@ #include /* kmap, kunmap */ #include /* 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 4ef7b433e7f..997067e6f4f 100644 --- a/src/kernel/osdmap.c +++ b/src/kernel/osdmap.c @@ -1,8 +1,8 @@ #include -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 a32ab1b244c..1052a933d0d 100644 --- 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 37032512351..dfc525f4b86 100644 --- 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