Commit 3be232f1 authored Oct 26, 2021 by Trond Myklebust

SUNRPC: Prevent immediate close+reconnect



If we have already set up the socket and are waiting for it to connect,
then don't immediately close and retry.

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

parent d896ba83

net/sunrpc/xprt.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -767,7 +767,8 @@ EXPORT_SYMBOL_GPL(xprt_disconnect_done);
		*/
		static void xprt_schedule_autoclose_locked(struct rpc_xprt *xprt)
		{
		set_bit(XPRT_CLOSE_WAIT, &xprt->state);
		if (test_and_set_bit(XPRT_CLOSE_WAIT, &xprt->state))
		return;
		if (test_and_set_bit(XPRT_LOCKED, &xprt->state) == 0)
		queue_work(xprtiod_workqueue, &xprt->task_cleanup);
		else if (xprt->snd_task && !test_bit(XPRT_SND_IS_COOKIE, &xprt->state))

net/sunrpc/xprtsock.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2314,7 +2314,7 @@ static void xs_connect(struct rpc_xprt xprt, struct rpc_task task)

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

		if (transport->sock != NULL) {
		if (transport->sock != NULL && !xprt_connecting(xprt)) {
		dprintk("RPC: xs_connect delayed xprt %p for %lu "
		"seconds\n",
		xprt, xprt->reestablish_timeout / HZ);