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

Commit 99b1a4c3 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Fix a thinko in xs_connect() 



It is rather pointless to test the value of transport->inet after
calling xs_reset_transport(), since it will always be zero, and
so we will never see any exponential back off behaviour.
Also don't force early connections for SOFTCONN tasks. If the server
disconnects us, we should respect the exponential backoff.

Cc: stable@vger.kernel.org # 4.0+
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 6f536936

net/sunrpc/xprtsock.c

+5 −4
Original line number Diff line number Diff line
@@ -2279,13 +2279,14 @@ static void xs_connect(struct rpc_xprt *xprt, struct rpc_task *task) 


	WARN_ON_ONCE(!xprt_lock_connect(xprt, task, transport));



	/* Start by resetting any existing state */

	xs_reset_transport(transport);



	if (transport->sock != NULL && !RPC_IS_SOFTCONN(task)) {

	if (transport->sock != NULL) {

		dprintk("RPC:       xs_connect delayed xprt %p for %lu "

				"seconds\n",

				xprt, xprt->reestablish_timeout / HZ);



		/* Start by resetting any existing state */

		xs_reset_transport(transport);



		queue_delayed_work(rpciod_workqueue,

				   &transport->connect_worker,

				   xprt->reestablish_timeout);