staging/lustre/obdclass: move obd_sysctl_init out of class_procfs_init

It is not strictly related to procfs. Besides, we already call obd_sysctl_clean
outside of class_procfs_clean.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/obdclass/class_obd.c b/drivers/staging/lustre/lustre/obdclass/class_obd.c
index 4fb1ecd089088fa50cd630e6e3ed39305be822c3..7b1d1b685803420d469bb89bc9d429e614849446 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/class_obd.c
+++ b/drivers/staging/lustre/lustre/obdclass/class_obd.c
@@ -564,6 +564,9 @@ static int __init init_obdclass(void)
        err = obd_init_caches();
        if (err)
                return err;
+
+       obd_sysctl_init();
+
        err = class_procfs_init();
        if (err)
                return err;

diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
index d1a57ebfda95dd79e81e5aada4cf08bc5ce54656..2efc43720ecb39ff6b6efd6320039b7f56751fc8 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
+++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-module.c
@@ -380,7 +380,6 @@ int class_procfs_init(void)
 {
        int rc = 0;
 
-       obd_sysctl_init();
        proc_lustre_root = lprocfs_register("fs/lustre", NULL,
                                            lprocfs_base, NULL);
        if (IS_ERR(proc_lustre_root)) {