summaryrefslogtreecommitdiffstats
path: root/fs/lockd
diff options
context:
space:
mode:
authorChuck Lever <cel@netapp.com>2005-08-25 16:25:49 -0700
committerTrond Myklebust <Trond.Myklebust@netapp.com>2005-09-23 12:38:35 -0400
commit43118c29dea2b23798bd42a147015cceee7fa885 (patch)
tree4951a6777a3dc167d46c1373c02d21912b250e96 /fs/lockd
parent808012fbb23a52ec59352445d2076d175ad4ab26 (diff)
downloadop-kernel-dev-43118c29dea2b23798bd42a147015cceee7fa885.zip
op-kernel-dev-43118c29dea2b23798bd42a147015cceee7fa885.tar.gz
[PATCH] RPC: get rid of xprt->stream
Now we can fix up the last few places that use the "xprt->stream" variable, and get rid of it from the rpc_xprt structure. Test-plan: Destructive testing (unplugging the network temporarily). Connectathon with UDP and TCP. Signed-off-by: Chuck Lever <cel@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/lockd')
-rw-r--r--fs/lockd/host.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 82c77df..7901f5b 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -173,11 +173,10 @@ nlm_bind_host(struct nlm_host *host)
/* If we've already created an RPC client, check whether
* RPC rebind is required
- * Note: why keep rebinding if we're on a tcp connection?
*/
if ((clnt = host->h_rpcclnt) != NULL) {
xprt = clnt->cl_xprt;
- if (!xprt->stream && time_after_eq(jiffies, host->h_nextrebind)) {
+ if (time_after_eq(jiffies, host->h_nextrebind)) {
clnt->cl_port = 0;
host->h_nextrebind = jiffies + NLM_HOST_REBIND;
dprintk("lockd: next rebind in %ld jiffies\n",
OpenPOWER on IntegriCloud