Commit ed63c003701a314c4893c11eceb9d68f8f46c662

Authored by Chuck Lever
Committed by Trond Myklebust
1 parent a58dd398f5

[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: Chuck Lever <cel@netapp.com>
 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

Showing 3 changed files with 0 additions and 4 deletions Side-by-side Diff

... ... @@ -188,7 +188,6 @@
188 188 goto forgetit;
189 189  
190 190 xprt_set_timeout(&xprt->timeout, 5, nlmsvc_timeout);
191   - xprt->nocong = 1; /* No congestion control for NLM */
192 191 xprt->resvport = 1; /* NLM requires a reserved port */
193 192  
194 193 /* Existing NLM servers accept AUTH_UNIX only */
include/linux/sunrpc/xprt.h
... ... @@ -172,7 +172,6 @@
172 172 unsigned int max_reqs; /* total slots */
173 173 unsigned long state; /* transport state */
174 174 unsigned char shutdown : 1, /* being shut down */
175   - nocong : 1, /* no congestion control */
176 175 resvport : 1; /* use a reserved port */
177 176  
178 177 /*
net/sunrpc/xprtsock.c
... ... @@ -1100,7 +1100,6 @@
1100 1100 xprt->prot = IPPROTO_UDP;
1101 1101 xprt->port = XS_MAX_RESVPORT;
1102 1102 xprt->tsh_size = 0;
1103   - xprt->nocong = 0;
1104 1103 xprt->cwnd = RPC_INITCWND;
1105 1104 xprt->resvport = capable(CAP_NET_BIND_SERVICE) ? 1 : 0;
1106 1105 /* XXX: header size can vary due to auth type, IPv6, etc. */
... ... @@ -1140,7 +1139,6 @@
1140 1139 xprt->prot = IPPROTO_TCP;
1141 1140 xprt->port = XS_MAX_RESVPORT;
1142 1141 xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32);
1143   - xprt->nocong = 1;
1144 1142 xprt->cwnd = RPC_MAXCWND(xprt);
1145 1143 xprt->resvport = capable(CAP_NET_BIND_SERVICE) ? 1 : 0;
1146 1144 xprt->max_payload = RPC_MAX_FRAGMENT_SIZE;