diff options
| author | Peng Tao | 2013-12-03 15:42:02 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-12-03 17:56:23 +0100 |
| commit | c7c5da015a4e142c4c7c77572a1e756136f7564b (patch) | |
| tree | d3a5b0ab865a936921d0ee4fb705a0523a5494cc /drivers/staging/lustre | |
| parent | staging/lustre/ldlm: inline ldlm_proc_setup (diff) | |
| download | kernel-qcow2-linux-c7c5da015a4e142c4c7c77572a1e756136f7564b.tar.gz kernel-qcow2-linux-c7c5da015a4e142c4c7c77572a1e756136f7564b.tar.xz kernel-qcow2-linux-c7c5da015a4e142c4c7c77572a1e756136f7564b.zip | |
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>
Diffstat (limited to 'drivers/staging/lustre')
| -rw-r--r-- | drivers/staging/lustre/lustre/obdclass/class_obd.c | 3 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/obdclass/linux/linux-module.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/lustre/lustre/obdclass/class_obd.c b/drivers/staging/lustre/lustre/obdclass/class_obd.c index 4fb1ecd08908..7b1d1b685803 100644 --- 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 d1a57ebfda95..2efc43720ecb 100644 --- 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)) { |