Commit 1fa3e2eb authored Mar 20, 2014 by Steve Dickson Committed by Trond Myklebust Mar 20, 2014

SUNRPC: Ensure call_connect_status() deals correctly with SOFTCONN tasks



Don't schedule an rpc_delay before checking to see if the task
is a SOFTCONN because the tk_callback from the delay (__rpc_atrun)
clears the task status before the rpc_exit_task can be run.

Signed-off-by: Steve Dickson <steved@redhat.com>
Fixes: 561ec160 (SUNRPC: call_connect_status should recheck...)
Link: http://lkml.kernel.org/r/5329CF7C.7090308@RedHat.com


Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

parent 9455e3f4

net/sunrpc/clnt.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1802,10 +1802,10 @@ call_connect_status(struct rpc_task *task)
		case -ECONNABORTED:
		case -ENETUNREACH:
		case -EHOSTUNREACH:
		/* retry with existing socket, after a delay */
		rpc_delay(task, 3*HZ);
		if (RPC_IS_SOFTCONN(task))
		break;
		/* retry with existing socket, after a delay */
		rpc_delay(task, 3*HZ);
		case -EAGAIN:
		/* Check for timeouts before looping back to call_bind */
		case -ETIMEDOUT: