SUNRPC: Prevent immediate close+reconnect

From: Trond Myklebust <trond.myklebust@hammerspace.com>

commit 3be232f11a3cc9b0ef0795e39fa11bdb8e422a06 upstream.

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>
Signed-off-by: Meena Shanmugam <meenashanmugam@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index a7dedc12c9827f4b4b8063a1e6886c84805bc059..68d08dcba018f08bfa32550afd3096897bf30957 100644 (file)
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -722,7 +722,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))

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 43bc02dea80c89a1e6e00d1c0770c4d3e28d05a1..49ba817f4fb658614904e189841b40a37a2bda21 100644 (file)
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -2469,7 +2469,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);