Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h

+0 −2
Original line number Diff line number Diff line
@@ -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)				     \

drivers/staging/lustre/include/linux/libcfs/linux/portals_compat25.h

+0 −2
Original line number Diff line number Diff line
@@ -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 */

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

drivers/staging/lustre/lnet/lnet/router_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -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

}