kclient: move dout etc. defs to ceph_debug.h

diff --git a/src/kernel/ceph_debug.h b/src/kernel/ceph_debug.h
index 00a7f66d98d69a132ac9082b3ce881fd942400a9..288b34322289c91f6a7dbc697bb8794bca1dcea1 100644 (file)
--- a/src/kernel/ceph_debug.h
+++ b/src/kernel/ceph_debug.h
@@ -3,9 +3,9 @@
 
 #include <linux/string.h>
 
-extern int ceph_debug;
+extern int ceph_debug;      /* debug level; if <0, defer to per-module level. */
+extern int ceph_debug_console;               /* send debug output to console? */
 extern int ceph_debug_mask;
-extern int ceph_debug_console;
 
 /* different debug level for the different modules */
 extern int ceph_debug_addr;
@@ -74,17 +74,49 @@ static struct _debug_mask_name _debug_mask_names[] = {
 
 static inline int ceph_get_debug_mask(char *name)
 {
-       int i=0;
+       int i = 0;
 
        while (_debug_mask_names[i].name) {
                if (strcmp(_debug_mask_names[i].name, name) == 0)
                        return _debug_mask_names[i].mask;
                i++;
        }
-
        return 0;
 }
 
+#define dout_flag(x, mask, 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); \
+                       else                                            \
+                               printk(KERN_DEBUG "ceph_" DOUT_PREFIX args); \
+               }                                                       \
+       } while (0)
+
+#define dout(x, args...) dout_flag(x, DOUT_MASK, args)
+
+#define derr(x, args...) do {                  \
+               printk(KERN_ERR "ceph_" DOUT_PREFIX args);      \
+       } while (0)
+
+
+/* dcache d_count debugging */
+#if 0
+# define dput(dentry)                                 \
+       do {                                           \
+               dout(20, "dput %p %d -> %d\n", dentry, \
+                    atomic_read(&dentry->d_count),    \
+                    atomic_read(&dentry->d_count)-1); \
+               dput(dentry);                          \
+       } while (0)
+# define d_drop(dentry)                                       \
+       do {                                           \
+               dout(20, "d_drop %p\n", dentry);       \
+               d_drop(dentry);                        \
+       } while (0)
 #endif
 
 
+#endif

diff --git a/src/kernel/super.h b/src/kernel/super.h
index 66feaff50f0f29f22467be7c51983cf58ce5f156..3ad2ae4667a50f25a7d5498c2841d3ca5275049e 100644 (file)
--- a/src/kernel/super.h
+++ b/src/kernel/super.h
@@ -10,65 +10,22 @@
 #include <linux/sysfs.h>
 #include <linux/backing-dev.h>
 
-#include "ceph_debug.h"
 #include "ceph_fs.h"
+#include "ceph_debug.h"
 #include "types.h"
 #include "messenger.h"
 #include "mon_client.h"
 #include "mds_client.h"
 #include "osd_client.h"
 
-extern int ceph_debug_console;
-extern int ceph_debug;
-extern int ceph_debug_msgr;
-extern int ceph_debug_super;
-extern int ceph_debug_mdsc;
-extern int ceph_debug_osdc;
-extern int ceph_debug_addr;
-extern int ceph_debug_inode;
-extern int ceph_debug_snap;
-extern int ceph_debug_ioctl;
-extern int ceph_debug_caps;
-
-extern int ceph_debug_mask;
-
-#define dout_flag(x, mask, 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); \
-                       else                                            \
-                               printk(KERN_DEBUG "ceph_" DOUT_PREFIX args); \
-               }                                                       \
-       } while (0)
-
-#define dout(x, args...) dout_flag(x, DOUT_MASK, args)
-
-#define derr(x, args...) do {                                          \
-               printk(KERN_ERR "ceph: " args); \
-       } while (0)
-
+/* f_type in struct statfs */
 #define CEPH_SUPER_MAGIC 0x00c36400
 
-#define CEPH_BLOCK_SHIFT 20    /* 1 MB blocks for purposes of statfs*/
-#define CEPH_BLOCK  (1 << CEPH_BLOCK_SHIFT)
-
-
-#if 0
-# define dput(dentry)                                 \
-       do {                                           \
-               dout(20, "dput %p %d -> %d\n", dentry, \
-                    atomic_read(&dentry->d_count),    \
-                    atomic_read(&dentry->d_count)-1); \
-               dput(dentry);                          \
-       } while (0)
-# define d_drop(dentry)                                       \
-       do {                                           \
-               dout(20, "d_drop %p\n", dentry);       \
-               d_drop(dentry);                        \
-       } while (0)
-#endif
+/* large granularity for statfs utilization stats to facilitate
+ * large volume sizes on 32-bit machines. */
+#define CEPH_BLOCK_SHIFT   20  /* 1 MB */
+#define CEPH_BLOCK         (1 << CEPH_BLOCK_SHIFT)
+
 
 /*
  * subtract jiffies