From: Sage Weil <sage@newdream.net>
Date: Wed, 30 Apr 2008 14:14:51 +0000 (-0700)
Subject: kclient: tear down /proc/fs/ceph on exit
X-Git-Tag: v0.2~67
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e3b00033c89a906dfafedf384de0e435af372d54;p=ceph.git

kclient: tear down /proc/fs/ceph on exit
---

diff --git a/src/kernel/proc.c b/src/kernel/proc.c
index 6b01573dd4b..6c450da2ed6 100644
--- a/src/kernel/proc.c
+++ b/src/kernel/proc.c
@@ -58,7 +58,7 @@ static int ceph_debug_level_write(struct file *file, const char __user *buffer,
 
 static struct proc_dir_entry *proc_fs_ceph;
 
-void ceph_fs_proc_init(void)
+void ceph_proc_init(void)
 {
 	struct proc_dir_entry *pde;
 
@@ -85,3 +85,11 @@ void ceph_fs_proc_init(void)
 		pde->write_proc = ceph_debug_level_write;
 
 }
+
+void ceph_proc_cleanup()
+{
+	remove_proc_entry("debug", proc_fs_ceph);
+	remove_proc_entry("debug_msgr", proc_fs_ceph);
+	remove_proc_entry("debug_console", proc_fs_ceph);
+	remove_proc_entry("ceph", proc_root_fs);
+}
diff --git a/src/kernel/super.c b/src/kernel/super.c
index b60f6ed7bb2..1469cfffcd0 100644
--- a/src/kernel/super.c
+++ b/src/kernel/super.c
@@ -921,8 +921,7 @@ static int __init init_ceph(void)
 	if (!ceph_kobj)
 		return -ENOMEM;
 #endif
-	
-	ceph_fs_proc_init();
+	ceph_proc_init();
 
 	ret = init_inodecache();
 	if (ret)
@@ -942,6 +941,7 @@ static void __exit exit_ceph(void)
 	kobject_put(ceph_kobj);
 	ceph_kobj = 0;
 #endif
+	ceph_proc_cleanup();
 
 	unregister_filesystem(&ceph_fs_type);
 	destroy_inodecache();
diff --git a/src/kernel/super.h b/src/kernel/super.h
index af02fc0033d..29d396f51fb 100644
--- a/src/kernel/super.h
+++ b/src/kernel/super.h
@@ -425,6 +425,7 @@ static inline void ceph_init_dentry(struct dentry *dentry) {
 extern const struct export_operations ceph_export_ops;
 
 /* proc.c */
-extern void ceph_fs_proc_init(void);
+extern void ceph_proc_init(void);
+extern void ceph_proc_cleanup(void);
 
 #endif /* _FS_CEPH_SUPER_H */