staging: lustre: remove cfs_register_sysctl_table macro

It was a wrapper around register_sysctl_table, so just remove it.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
index e2a6c10..029929a 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
@@ -79,8 +79,6 @@
 typedef struct ctl_table               ctl_table_t;
 typedef struct ctl_table_header                ctl_table_header_t;
 
-#define cfs_register_sysctl_table(t, a) register_sysctl_table(t)
-
 #define DECLARE_PROC_HANDLER(name)                   \
 static int                                           \
 LL_PROC_PROTO(name)                                 \

diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h b/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
index 6cf758d..2bbb4d5 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h
@@ -104,6 +104,4 @@ int proc_call_handler(void *data, int write,
 #define cfs_for_each_possible_cpu(cpu) for_each_cpu(cpu)
 #endif
 
-#define cfs_register_sysctl_table(t, a) register_sysctl_table(t)
-
 #endif /* _PORTALS_COMPAT_H */

diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c
index e21028b..92dc567 100644 (file)
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c
@@ -404,7 +404,7 @@ kiblnd_sysctl_init (void)
                              sizeof(ipif_basename_space));
 
        kiblnd_tunables.kib_sysctl =
-               cfs_register_sysctl_table(kiblnd_top_ctl_table, 0);
+               register_sysctl_table(kiblnd_top_ctl_table);
 
        if (kiblnd_tunables.kib_sysctl == NULL)
                CWARN("Can't setup /proc tunables\n");

diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.c
index 27392d8..a1c6a51 100644 (file)
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.c
@@ -316,7 +316,7 @@ ksocknal_lib_tunables_init ()
                *ksocknal_tunables.ksnd_zc_recv_min_nfrags = LNET_MAX_IOV;
 
        ksocknal_tunables.ksnd_sysctl =
-               cfs_register_sysctl_table(ksocknal_top_ctl_table, 0);
+               register_sysctl_table(ksocknal_top_ctl_table);
 
        if (ksocknal_tunables.ksnd_sysctl == NULL)
                CWARN("Can't setup /proc tunables\n");

diff --git a/drivers/staging/lustre/lnet/lnet/router_proc.c b/drivers/staging/lustre/lnet/lnet/router_proc.c
index 3084b0c..931f6ca 100644 (file)
--- a/drivers/staging/lustre/lnet/lnet/router_proc.c
+++ b/drivers/staging/lustre/lnet/lnet/router_proc.c
@@ -920,7 +920,7 @@ lnet_proc_init(void)
 {
 #ifdef CONFIG_SYSCTL
        if (lnet_table_header == NULL)
-               lnet_table_header = cfs_register_sysctl_table(top_table, 0);
+               lnet_table_header = register_sysctl_table(top_table);
 #endif
 }
 

diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
index 80a9fab..fc6c977 100644 (file)
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
@@ -562,7 +562,7 @@ int insert_proc(void)
 {
 #ifdef CONFIG_SYSCTL
        if (lnet_table_header == NULL)
-               lnet_table_header = cfs_register_sysctl_table(top_table, 0);
+               lnet_table_header = register_sysctl_table(top_table);
 #endif
        return 0;
 }

diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
index c4a7402..acd2619 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
+++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
@@ -429,7 +429,7 @@ void obd_sysctl_init (void)
 {
 #ifdef CONFIG_SYSCTL
        if ( !obd_table_header )
-               obd_table_header = cfs_register_sysctl_table(parent_table, 0);
+               obd_table_header = register_sysctl_table(parent_table);
 #endif
 }