Commit a7f24447 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ee92d533
...@@ -79,8 +79,6 @@ ...@@ -79,8 +79,6 @@
typedef struct ctl_table ctl_table_t; typedef struct ctl_table ctl_table_t;
typedef struct ctl_table_header ctl_table_header_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) \ #define DECLARE_PROC_HANDLER(name) \
static int \ static int \
LL_PROC_PROTO(name) \ LL_PROC_PROTO(name) \
......
...@@ -104,6 +104,4 @@ int proc_call_handler(void *data, int write, ...@@ -104,6 +104,4 @@ int proc_call_handler(void *data, int write,
#define cfs_for_each_possible_cpu(cpu) for_each_cpu(cpu) #define cfs_for_each_possible_cpu(cpu) for_each_cpu(cpu)
#endif #endif
#define cfs_register_sysctl_table(t, a) register_sysctl_table(t)
#endif /* _PORTALS_COMPAT_H */ #endif /* _PORTALS_COMPAT_H */
...@@ -404,7 +404,7 @@ kiblnd_sysctl_init (void) ...@@ -404,7 +404,7 @@ kiblnd_sysctl_init (void)
sizeof(ipif_basename_space)); sizeof(ipif_basename_space));
kiblnd_tunables.kib_sysctl = 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) if (kiblnd_tunables.kib_sysctl == NULL)
CWARN("Can't setup /proc tunables\n"); CWARN("Can't setup /proc tunables\n");
......
...@@ -316,7 +316,7 @@ ksocknal_lib_tunables_init () ...@@ -316,7 +316,7 @@ ksocknal_lib_tunables_init ()
*ksocknal_tunables.ksnd_zc_recv_min_nfrags = LNET_MAX_IOV; *ksocknal_tunables.ksnd_zc_recv_min_nfrags = LNET_MAX_IOV;
ksocknal_tunables.ksnd_sysctl = 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) if (ksocknal_tunables.ksnd_sysctl == NULL)
CWARN("Can't setup /proc tunables\n"); CWARN("Can't setup /proc tunables\n");
......
...@@ -920,7 +920,7 @@ lnet_proc_init(void) ...@@ -920,7 +920,7 @@ lnet_proc_init(void)
{ {
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
if (lnet_table_header == NULL) if (lnet_table_header == NULL)
lnet_table_header = cfs_register_sysctl_table(top_table, 0); lnet_table_header = register_sysctl_table(top_table);
#endif #endif
} }
......
...@@ -562,7 +562,7 @@ int insert_proc(void) ...@@ -562,7 +562,7 @@ int insert_proc(void)
{ {
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
if (lnet_table_header == NULL) if (lnet_table_header == NULL)
lnet_table_header = cfs_register_sysctl_table(top_table, 0); lnet_table_header = register_sysctl_table(top_table);
#endif #endif
return 0; return 0;
} }
......
...@@ -429,7 +429,7 @@ void obd_sysctl_init (void) ...@@ -429,7 +429,7 @@ void obd_sysctl_init (void)
{ {
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
if ( !obd_table_header ) if ( !obd_table_header )
obd_table_header = cfs_register_sysctl_table(parent_table, 0); obd_table_header = register_sysctl_table(parent_table);
#endif #endif
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment