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

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

[PATCH] RPC: remove xprt->nocong 



 Get rid of the "xprt->nocong" variable.

 Test-plan:
 Use WAN simulation to cause sporadic bursty packet loss with UDP mounts.
 Look for significant regression in performance or client stability.

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

fs/lockd/host.c

+0 −1
Original line number Diff line number Diff line
@@ -188,7 +188,6 @@ nlm_bind_host(struct nlm_host *host) 
			goto forgetit;



		xprt_set_timeout(&xprt->timeout, 5, nlmsvc_timeout);

		xprt->nocong = 1;	/* No congestion control for NLM */

		xprt->resvport = 1;	/* NLM requires a reserved port */



		/* Existing NLM servers accept AUTH_UNIX only */

include/linux/sunrpc/xprt.h

+0 −1
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ struct rpc_xprt { 
	unsigned int		max_reqs;	/* total slots */

	unsigned long		state;		/* transport state */

	unsigned char		shutdown   : 1,	/* being shut down */

				nocong	   : 1,	/* no congestion control */

				resvport   : 1; /* use a reserved port */



	/*

net/sunrpc/xprtsock.c

+0 −2
Original line number Diff line number Diff line
@@ -1100,7 +1100,6 @@ int xs_setup_udp(struct rpc_xprt *xprt, struct rpc_timeout *to) 
	xprt->prot = IPPROTO_UDP;

	xprt->port = XS_MAX_RESVPORT;

	xprt->tsh_size = 0;

	xprt->nocong = 0;

	xprt->cwnd = RPC_INITCWND;

	xprt->resvport = capable(CAP_NET_BIND_SERVICE) ? 1 : 0;

	/* XXX: header size can vary due to auth type, IPv6, etc. */
@@ -1140,7 +1139,6 @@ int xs_setup_tcp(struct rpc_xprt *xprt, struct rpc_timeout *to) 
	xprt->prot = IPPROTO_TCP;

	xprt->port = XS_MAX_RESVPORT;

	xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32);

	xprt->nocong = 1;

	xprt->cwnd = RPC_MAXCWND(xprt);

	xprt->resvport = capable(CAP_NET_BIND_SERVICE) ? 1 : 0;

	xprt->max_payload = RPC_MAX_FRAGMENT_SIZE;