From 4fb7396c4d1ffd63c53658ec8c4489ba9940f2af Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Tue, 6 Nov 2007 18:40:12 -0500 Subject: [PATCH] --- yaml --- r: 79579 b: refs/heads/master c: 3ebb067d92ebe5bcfd282acf12bade891d334d07 h: refs/heads/master i: 79577: 1c97321de037a81fbb875fbb317499665fab4835 79575: cf340d6d98299f72a4b8376afab999d50f0ca813 v: v3 --- [refs] | 2 +- trunk/net/sunrpc/clnt.c | 4 ++-- trunk/net/sunrpc/xprtsock.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a736e5b53b6f..42d3a181f7a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7272dcd31d56580dee7693c21e369fd167e137fe +refs/heads/master: 3ebb067d92ebe5bcfd282acf12bade891d334d07 diff --git a/trunk/net/sunrpc/clnt.c b/trunk/net/sunrpc/clnt.c index 76be83ee4b04..046d8f68483b 100644 --- a/trunk/net/sunrpc/clnt.c +++ b/trunk/net/sunrpc/clnt.c @@ -1137,7 +1137,7 @@ call_status(struct rpc_task *task) case -ETIMEDOUT: task->tk_action = call_timeout; if (task->tk_client->cl_discrtry) - xprt_disconnect(task->tk_xprt); + xprt_force_disconnect(task->tk_xprt); break; case -ECONNREFUSED: case -ENOTCONN: @@ -1260,7 +1260,7 @@ call_decode(struct rpc_task *task) req->rq_received = req->rq_private_buf.len = 0; task->tk_status = 0; if (task->tk_client->cl_discrtry) - xprt_disconnect(task->tk_xprt); + xprt_force_disconnect(task->tk_xprt); } /* diff --git a/trunk/net/sunrpc/xprtsock.c b/trunk/net/sunrpc/xprtsock.c index 9b06b8b2a112..8c9af3d92c67 100644 --- a/trunk/net/sunrpc/xprtsock.c +++ b/trunk/net/sunrpc/xprtsock.c @@ -903,7 +903,7 @@ static inline void xs_tcp_read_fraghdr(struct rpc_xprt *xprt, struct xdr_skb_rea /* Sanity check of the record length */ if (unlikely(transport->tcp_reclen < 4)) { dprintk("RPC: invalid TCP record fragment length\n"); - xprt_disconnect(xprt); + xprt_force_disconnect(xprt); return; } dprintk("RPC: reading TCP record fragment of length %d\n",