staging/lustre/obd: remove unused proc_lustre_root

Signed-off-by: Dmitry Eremin <dmiter4ever@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/include/lprocfs_status.h b/drivers/staging/lustre/lustre/include/lprocfs_status.h
index 721efd6cc69862aa2146ecacdd269887c8c43368..19ab9e8b7eee0fff7fa4f3fe12c07de8cc427dfd 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lprocfs_status.h
+++ b/drivers/staging/lustre/lustre/include/lprocfs_status.h
@@ -349,7 +349,6 @@ enum {
 
 #define EXTRA_FIRST_OPC LDLM_GLIMPSE_ENQUEUE
 /* class_obd.c */
-extern struct proc_dir_entry *proc_lustre_root;
 extern struct dentry *debugfs_lustre_root;
 extern struct kobject *lustre_kobj;
 
@@ -851,8 +850,6 @@ extern int lprocfs_quota_wr_qs_factor(struct file *file,
 #else
 /* CONFIG_PROC_FS is not defined */
 
-#define proc_lustre_root NULL
-
 static inline void lprocfs_counter_add(struct lprocfs_stats *stats,
                                       int index, long amount)
 { return; }

diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
index 03a982a9309fd063e9077e015d0019669febed53..50c3d1de24cb12146f91381b69b6a230fb14bfac 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
+++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
@@ -322,11 +322,6 @@ static ssize_t jobid_name_store(struct kobject *kobj, struct attribute *attr,
 struct dentry *debugfs_lustre_root;
 EXPORT_SYMBOL_GPL(debugfs_lustre_root);
 
-#if defined(CONFIG_PROC_FS)
-/* Root for /proc/fs/lustre */
-struct proc_dir_entry *proc_lustre_root = NULL;
-EXPORT_SYMBOL(proc_lustre_root);
-
 LUSTRE_RO_ATTR(version);
 LUSTRE_RO_ATTR(pinger);
 LUSTRE_RO_ATTR(health);
@@ -459,14 +454,6 @@ int class_procfs_init(void)
                kobject_put(lustre_kobj);
                goto out;
        }
-
-       proc_lustre_root = lprocfs_register("fs/lustre", NULL, NULL, NULL);
-       if (IS_ERR(proc_lustre_root)) {
-               rc = PTR_ERR(proc_lustre_root);
-               proc_lustre_root = NULL;
-               kobject_put(lustre_kobj);
-               goto out;
-       }
 out:
        return rc;
 }
@@ -478,12 +465,7 @@ int class_procfs_clean(void)
 
        debugfs_lustre_root = NULL;
 
-       if (proc_lustre_root) {
-               lprocfs_remove(&proc_lustre_root);
-       }
-
        kobject_put(lustre_kobj);
 
        return 0;
 }
-#endif /* CONFIG_PROC_FS */