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

Commit cfcb43ff authored by James Lentini's avatar James Lentini Committed by Trond Myklebust
Browse files

SUNRPC: remove NFS/RDMA client's binary sysctls 



Support for binary sysctls is being deprecated in 2.6.24. Since there
are no applications using the NFS/RDMA client's binary sysctls, it
makes sense to remove them. The patch below does this while leaving
the /proc/sys interface unchanged.

Please consider this for 2.6.24.

Signed-off-by: default avatarJames Lentini <jlentini@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 4c1fe2f7

include/linux/sunrpc/debug.h

+0 −5
Original line number Diff line number Diff line
@@ -88,11 +88,6 @@ enum { 
	CTL_SLOTTABLE_TCP,

	CTL_MIN_RESVPORT,

	CTL_MAX_RESVPORT,

	CTL_SLOTTABLE_RDMA,

	CTL_RDMA_MAXINLINEREAD,

	CTL_RDMA_MAXINLINEWRITE,

	CTL_RDMA_WRITEPADDING,

	CTL_RDMA_MEMREG,

};



#endif /* _LINUX_SUNRPC_DEBUG_H_ */

net/sunrpc/xprtrdma/transport.c

+5 −5
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static struct ctl_table_header *sunrpc_table_header; 


static ctl_table xr_tunables_table[] = {

	{

		.ctl_name	= CTL_SLOTTABLE_RDMA,

		.ctl_name       = CTL_UNNUMBERED,

		.procname	= "rdma_slot_table_entries",

		.data		= &xprt_rdma_slot_table_entries,

		.maxlen		= sizeof(unsigned int),
@@ -100,7 +100,7 @@ static ctl_table xr_tunables_table[] = { 
		.extra2		= &max_slot_table_size

	},

	{

		.ctl_name	= CTL_RDMA_MAXINLINEREAD,

		.ctl_name       = CTL_UNNUMBERED,

		.procname	= "rdma_max_inline_read",

		.data		= &xprt_rdma_max_inline_read,

		.maxlen		= sizeof(unsigned int),
@@ -109,7 +109,7 @@ static ctl_table xr_tunables_table[] = { 
		.strategy	= &sysctl_intvec,

	},

	{

		.ctl_name	= CTL_RDMA_MAXINLINEWRITE,

		.ctl_name       = CTL_UNNUMBERED,

		.procname	= "rdma_max_inline_write",

		.data		= &xprt_rdma_max_inline_write,

		.maxlen		= sizeof(unsigned int),
@@ -118,7 +118,7 @@ static ctl_table xr_tunables_table[] = { 
		.strategy	= &sysctl_intvec,

	},

	{

		.ctl_name	= CTL_RDMA_WRITEPADDING,

		.ctl_name       = CTL_UNNUMBERED,

		.procname	= "rdma_inline_write_padding",

		.data		= &xprt_rdma_inline_write_padding,

		.maxlen		= sizeof(unsigned int),
@@ -129,7 +129,7 @@ static ctl_table xr_tunables_table[] = { 
		.extra2		= &max_padding,

	},

	{

		.ctl_name	= CTL_RDMA_MEMREG,

		.ctl_name       = CTL_UNNUMBERED,

		.procname	= "rdma_memreg_strategy",

		.data		= &xprt_rdma_memreg_strategy,

		.maxlen		= sizeof(unsigned int),