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

Commit c556b754 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

SUNRPC: allow sunrpc.o to link when CONFIG_SYSCTL is disabled 



 The sunrpc module should build properly even when CONFIG_SYSCTL is
 disabled.

 Reported by Jan-Benedict Glaw.

 Test plan:
 Compile kernel with CONFIG_NFS as a module and built-in, and CONFIG_SYSCTL
 enabled and disabled.

 Signed-off-by: default avatarChuck Lever <cel@netapp.com>
 Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 6bfc93ef

net/sunrpc/sunrpc_syms.c

+0 −2
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ EXPORT_SYMBOL(rpc_mkpipe); 
/* Client transport */

EXPORT_SYMBOL(xprt_create_proto);

EXPORT_SYMBOL(xprt_set_timeout);

EXPORT_SYMBOL(xprt_udp_slot_table_entries);

EXPORT_SYMBOL(xprt_tcp_slot_table_entries);



/* Client credential cache */

EXPORT_SYMBOL(rpcauth_register);

net/sunrpc/sysctl.c

+0 −7
Original line number Diff line number Diff line
@@ -119,13 +119,6 @@ proc_dodebug(ctl_table *table, int write, struct file *file, 
	return 0;

}



unsigned int xprt_udp_slot_table_entries = RPC_DEF_SLOT_TABLE;

unsigned int xprt_tcp_slot_table_entries = RPC_DEF_SLOT_TABLE;

unsigned int xprt_min_resvport = RPC_DEF_MIN_RESVPORT;

EXPORT_SYMBOL(xprt_min_resvport);

unsigned int xprt_max_resvport = RPC_DEF_MAX_RESVPORT;

EXPORT_SYMBOL(xprt_max_resvport);





static unsigned int min_slot_table_size = RPC_MIN_SLOT_TABLE;

static unsigned int max_slot_table_size = RPC_MAX_SLOT_TABLE;

net/sunrpc/xprtsock.c

+9 −0
Original line number Diff line number Diff line
@@ -35,6 +35,15 @@ 
#include <net/udp.h>

#include <net/tcp.h>



/*

 * xprtsock tunables

 */

unsigned int xprt_udp_slot_table_entries = RPC_DEF_SLOT_TABLE;

unsigned int xprt_tcp_slot_table_entries = RPC_DEF_SLOT_TABLE;



unsigned int xprt_min_resvport = RPC_DEF_MIN_RESVPORT;

unsigned int xprt_max_resvport = RPC_DEF_MAX_RESVPORT;



/*

 * How many times to try sending a request on a socket before waiting

 * for the socket buffer to clear.