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

Commit fdb63dcd authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Ensure that call_bind times out correctly 



If the rpcbind server is unavailable, we still want the RPC client
to respect the timeout.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 485f2251

net/sunrpc/clnt.c

+2 −3
Original line number Diff line number Diff line
@@ -1728,9 +1728,7 @@ call_bind_status(struct rpc_task *task) 
	case -EPROTONOSUPPORT:

		dprintk("RPC: %5u remote rpcbind version unavailable, retrying\n",

				task->tk_pid);

		task->tk_status = 0;

		task->tk_action = call_bind;

		return;

		goto retry_timeout;

	case -ECONNREFUSED:		/* connection problems */

	case -ECONNRESET:

	case -ECONNABORTED:
@@ -1756,6 +1754,7 @@ call_bind_status(struct rpc_task *task) 
	return;



retry_timeout:

	task->tk_status = 0;

	task->tk_action = call_timeout;

}