aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/lockd/host.c1
-rw-r--r--include/linux/sunrpc/xprt.h1
-rw-r--r--net/sunrpc/xprtsock.c2
3 files changed, 0 insertions, 4 deletions
diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 7901f5b8092c..c4c8601096e0 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -188,7 +188,6 @@ nlm_bind_host(struct nlm_host *host)
188 goto forgetit; 188 goto forgetit;
189 189
190 xprt_set_timeout(&xprt->timeout, 5, nlmsvc_timeout); 190 xprt_set_timeout(&xprt->timeout, 5, nlmsvc_timeout);
191 xprt->nocong = 1; /* No congestion control for NLM */
192 xprt->resvport = 1; /* NLM requires a reserved port */ 191 xprt->resvport = 1; /* NLM requires a reserved port */
193 192
194 /* Existing NLM servers accept AUTH_UNIX only */ 193 /* Existing NLM servers accept AUTH_UNIX only */
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index 64e77658fa30..559fb471f6f2 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -172,7 +172,6 @@ struct rpc_xprt {
172 unsigned int max_reqs; /* total slots */ 172 unsigned int max_reqs; /* total slots */
173 unsigned long state; /* transport state */ 173 unsigned long state; /* transport state */
174 unsigned char shutdown : 1, /* being shut down */ 174 unsigned char shutdown : 1, /* being shut down */
175 nocong : 1, /* no congestion control */
176 resvport : 1; /* use a reserved port */ 175 resvport : 1; /* use a reserved port */
177 176
178 /* 177 /*
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 6c2f5dcea416..7e5e020fe78d 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1100,7 +1100,6 @@ int xs_setup_udp(struct rpc_xprt *xprt, struct rpc_timeout *to)
1100 xprt->prot = IPPROTO_UDP; 1100 xprt->prot = IPPROTO_UDP;
1101 xprt->port = XS_MAX_RESVPORT; 1101 xprt->port = XS_MAX_RESVPORT;
1102 xprt->tsh_size = 0; 1102 xprt->tsh_size = 0;
1103 xprt->nocong = 0;
1104 xprt->cwnd = RPC_INITCWND; 1103 xprt->cwnd = RPC_INITCWND;
1105 xprt->resvport = capable(CAP_NET_BIND_SERVICE) ? 1 : 0; 1104 xprt->resvport = capable(CAP_NET_BIND_SERVICE) ? 1 : 0;
1106 /* XXX: header size can vary due to auth type, IPv6, etc. */ 1105 /* 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)
1140 xprt->prot = IPPROTO_TCP; 1139 xprt->prot = IPPROTO_TCP;
1141 xprt->port = XS_MAX_RESVPORT; 1140 xprt->port = XS_MAX_RESVPORT;
1142 xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32); 1141 xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32);
1143 xprt->nocong = 1;
1144 xprt->cwnd = RPC_MAXCWND(xprt); 1142 xprt->cwnd = RPC_MAXCWND(xprt);
1145 xprt->resvport = capable(CAP_NET_BIND_SERVICE) ? 1 : 0; 1143 xprt->resvport = capable(CAP_NET_BIND_SERVICE) ? 1 : 0;
1146 xprt->max_payload = RPC_MAX_FRAGMENT_SIZE; 1144 xprt->max_payload = RPC_MAX_FRAGMENT_SIZE;