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

Commit 3ebb067d authored Nov 06, 2007 by Trond Myklebust

SUNRPC: Make call_status()/call_decode() call xprt_force_disconnect()



Move the calls to xprt_disconnect() over to xprt_force_disconnect() in
order to enable the transport layer to manage the state of the
XPRT_CONNECTED flag.
Ditto in xs_tcp_read_fraghdr().

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

parent 7272dcd3

net/sunrpc/clnt.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}

		/*

net/sunrpc/xprtsock.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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",