staging/lustre: Get rid of remaining /proc/sys/lustre plumbing
authorOleg Drokin <green@linuxhacker.ru>
Mon, 6 Jul 2015 16:48:50 +0000 (12:48 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 Jul 2015 02:47:20 +0000 (19:47 -0700)
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 <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lustre/include/obd_class.h
drivers/staging/lustre/lustre/obdclass/class_obd.c
drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c

index 7dce4eea85750a68ac8263dc1ac222a12fc7ba7b..e1f8b15753f91df508aefe7a1df5566797c16830 100644 (file)
@@ -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];
index 2e42d1a637f1704a145823f827a5c71f5ccaa353..edb2c7d525db8af92d3fc3da6b4656032ed6c39e 100644 (file)
@@ -659,7 +659,6 @@ static void cleanup_obdclass(void)
        lu_global_fini();
 
        obd_cleanup_caches();
-       obd_sysctl_clean();
 
        class_procfs_clean();
 
index 82b3c39214b08d589f35c631f150065fd13f41c5..1515163a81a5385f5e183c12f3bd4e573d042605 100644 (file)
 #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
 }