From 8952aad1cfc178cae5205546be62f0e22a056f0b Mon Sep 17 00:00:00 2001 From: Oleg Drokin Date: Mon, 6 Jul 2015 12:48:50 -0400 Subject: [PATCH] staging/lustre: Get rid of remaining /proc/sys/lustre plumbing Since all of the variables from /proc/sys/lustre were moved to /sys/fs/lustre, get rid of the remaining infrastructure. Signed-off-by: Oleg Drokin Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/lustre/include/obd_class.h | 1 - drivers/staging/lustre/lustre/obdclass/class_obd.c | 1 - .../lustre/lustre/obdclass/linux/linux-sysctl.c | 30 ---------------------- 3 files changed, 32 deletions(-) diff --git a/drivers/staging/lustre/lustre/include/obd_class.h b/drivers/staging/lustre/lustre/include/obd_class.h index 7dce4ee..e1f8b15 100644 --- a/drivers/staging/lustre/lustre/include/obd_class.h +++ b/drivers/staging/lustre/lustre/include/obd_class.h @@ -1870,7 +1870,6 @@ extern int (*ptlrpc_put_connection_superhack)(struct ptlrpc_connection *c); /* sysctl.c */ extern int obd_sysctl_init(void); -extern void obd_sysctl_clean(void); /* uuid.c */ typedef __u8 class_uuid_t[16]; diff --git a/drivers/staging/lustre/lustre/obdclass/class_obd.c b/drivers/staging/lustre/lustre/obdclass/class_obd.c index 2e42d1a..edb2c7d 100644 --- a/drivers/staging/lustre/lustre/obdclass/class_obd.c +++ b/drivers/staging/lustre/lustre/obdclass/class_obd.c @@ -659,7 +659,6 @@ static void cleanup_obdclass(void) lu_global_fini(); obd_cleanup_caches(); - obd_sysctl_clean(); class_procfs_clean(); diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c index 82b3c39..1515163 100644 --- a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c +++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c @@ -50,10 +50,6 @@ #include "../../include/obd_support.h" #include "../../include/lprocfs_status.h" -#ifdef CONFIG_SYSCTL -static struct ctl_table_header *obd_table_header; -#endif - struct static_lustre_uintvalue_attr { struct { struct attribute attr; @@ -144,23 +140,6 @@ LUSTRE_STATIC_UINT_ATTR(at_extra, &at_extra); LUSTRE_STATIC_UINT_ATTR(at_early_margin, &at_early_margin); LUSTRE_STATIC_UINT_ATTR(at_history, &at_history); -#ifdef CONFIG_SYSCTL -static struct ctl_table obd_table[] = { - {} -}; - -static struct ctl_table parent_table[] = { - { - .procname = "lustre", - .data = NULL, - .maxlen = 0, - .mode = 0555, - .child = obd_table - }, - {} -}; -#endif - static struct attribute *lustre_attrs[] = { &lustre_sattr_timeout.u.attr, &lustre_attr_max_dirty_mb.attr, @@ -181,18 +160,9 @@ static struct attribute_group lustre_attr_group = { int obd_sysctl_init(void) { -#ifdef CONFIG_SYSCTL - if (!obd_table_header) - obd_table_header = register_sysctl_table(parent_table); -#endif return sysfs_create_group(lustre_kobj, &lustre_attr_group); } void obd_sysctl_clean(void) { -#ifdef CONFIG_SYSCTL - if (obd_table_header) - unregister_sysctl_table(obd_table_header); - obd_table_header = NULL; -#endif } -- 2.7.4