kclient: adding unmaskable debug flag

diff --git a/src/kernel/ceph_debug.h b/src/kernel/ceph_debug.h
index 0bed8ae8cb3258816b0c6f0b07afc1dccd7851ed..f825b0e98bce010bb8181788830fcc88f5bd003a 100644 (file)
--- a/src/kernel/ceph_debug.h
+++ b/src/kernel/ceph_debug.h
@@ -18,6 +18,8 @@
 #define DOUT_MASK_SUPER                0x00004000
 #define DOUT_MASK_PROTOCOL     0x00008000
 
+#define DOUT_UNMASKABLE        0x80000000
+
 #endif
 
 

diff --git a/src/kernel/super.h b/src/kernel/super.h
index 9babb026e9ce8826f64eca59b9ef43905208380b..32a149b38c99d035c303364774beefd5786673a2 100644 (file)
--- a/src/kernel/super.h
+++ b/src/kernel/super.h
@@ -33,7 +33,7 @@ extern int ceph_debug_mask;
 #define CEPH_DUMP_ERROR_ALWAYS
 
 #define dout_flag(x, mask, args...) do {                                               \
-               if ((ceph_debug_mask & mask) &&                         \
+               if (((ceph_debug_mask | DOUT_UNMASKABLE) & mask) &&                             \
                        ((DOUT_VAR >= 0 && x <= DOUT_VAR) ||                    \
                        (DOUT_VAR < 0 && x <= ceph_debug))) {           \
                        if (ceph_debug_console)                         \