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 e2a6c10ae4e69ccbd4ab1c7e79a242a5c5250b8d..029929a4fabcd393ffcf7427ff234a6f53e77cdb 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 6cf758dbf9ef4a93de5f65821cdd85854c974661..2bbb4d5c40520d6c87bc1033e94fb615bb70ff0e 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 e21028b72302f05ccf70185a6c492d39d661fc9f..92dc5672e2ddf893f0304f10be53f466c266605f 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 27392d8b3bfef417a3cd59b1c26a297b447b7f9f..a1c6a519bf5b76d35a7095cf31b3b66dace85a58 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 3084b0c75983cba8088381187dcf78922f10ef0e..931f6ca25dc72268a11043281d7714bff72b3d99 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 80a9fab9b9c19d690a915f617e3df7f947abe76d..fc6c9774948703bc55eef0e4f477303d8ee18eab 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 c4a740286ad1145fffcdcbe6141610d1dee5cee5..acd2619227dfcf905c861500037f1b110aa61caa 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
 }