From 4be7eca084a5a80ec16ae789b37637f2f669492c Mon Sep 17 00:00:00 2001
From: Yehuda Sadeh-Weinraub <yehuda@yehuda.infit.com>
Date: Wed, 6 Feb 2008 15:13:15 +0200
Subject: [PATCH] added proc entry for setting debug level

---
 src/kernel/Makefile | 3 ++-
 src/kernel/client.c | 2 +-
 src/kernel/super.c  | 3 +++
 src/kernel/super.h  | 7 +++++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/kernel/Makefile b/src/kernel/Makefile
index 16e07bb1fb66a..554e393722169 100644
--- a/src/kernel/Makefile
+++ b/src/kernel/Makefile
@@ -9,4 +9,5 @@ ceph-objs := super.o inode.o dir.o file.o addr.o \
 	client.o \
 	mds_client.o mdsmap.o \
 	mon_client.o \
-	osd_client.o osdmap.o crush/crush.o crush/mapper.o
+	osd_client.o osdmap.o crush/crush.o crush/mapper.o \
+	proc.o
diff --git a/src/kernel/client.c b/src/kernel/client.c
index df7e9c02131e1..e2db970eefc7b 100644
--- a/src/kernel/client.c
+++ b/src/kernel/client.c
@@ -4,7 +4,7 @@
 #include <linux/sched.h>
 #include <linux/random.h>
 
-/* debug level; defined in include/ceph_fs.h */
+/* debug level; defined in super.h */
 int ceph_debug = 0;
 
 int ceph_client_debug = 50;
diff --git a/src/kernel/super.c b/src/kernel/super.c
index f628f6f904fa0..e533a29ba6522 100644
--- a/src/kernel/super.c
+++ b/src/kernel/super.c
@@ -507,6 +507,9 @@ static int __init init_ceph(void)
 	int ret = 0;
 
 	dout(1, "init_ceph\n");
+
+	ceph_fs_proc_init();
+
 	ret = init_inodecache();
 	if (ret)
 		goto out;
diff --git a/src/kernel/super.h b/src/kernel/super.h
index a14ba7baf3f4d..9a753e50b762d 100644
--- a/src/kernel/super.h
+++ b/src/kernel/super.h
@@ -20,11 +20,11 @@ extern int ceph_debug_osdc;
 extern int ceph_lookup_cache;
 
 #define dout(x, args...) do {						\
-		if (x <= (ceph_debug ? ceph_debug : DOUT_VAR))		\
+		if (x <= ((ceph_debug >= 0) ? ceph_debug : DOUT_VAR))		\
 			printk(KERN_INFO "ceph_" DOUT_PREFIX args);	\
 	} while (0)
 #define derr(x, args...) do {					   \
-		if (x <= (ceph_debug ? ceph_debug : DOUT_VAR))	   \
+		if (x <= ((ceph_debug >= 0) ? ceph_debug : DOUT_VAR))	   \
 			printk(KERN_ERR "ceph_" DOUT_PREFIX args); \
 	} while (0)
 
@@ -313,4 +313,7 @@ extern int ceph_request_lookup(struct super_block *sb, struct dentry *dentry,
 				      struct ceph_mds_reply_info *prinfo);
 extern void ceph_touch_dentry(struct dentry *dentry);
 
+/* proc.c */
+extern void ceph_fs_proc_init(void);
+
 #endif /* _FS_CEPH_CEPH_H */
-- 
2.39.5