From: Peng Tao Date: Tue, 3 Dec 2013 14:42:02 +0000 (+0800) Subject: staging/lustre/obdclass: move obd_sysctl_init out of class_procfs_init X-Git-Tag: next-20131204~11^2~74 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c7c5da015a4e142c4c7c77572a1e756136f7564b;p=karo-tx-linux.git 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 Signed-off-by: Andreas Dilger Signed-off-by: Greg Kroah-Hartman --- 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)) {