Merge tag 'block-5.15-2021-09-05' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / net / sunrpc / xprt.c

diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 05abe34..cfd6817 100644 (file)
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -761,6 +761,20 @@ void xprt_disconnect_done(struct rpc_xprt *xprt)
 }
 EXPORT_SYMBOL_GPL(xprt_disconnect_done);
 
+/**
+ * xprt_schedule_autoclose_locked - Try to schedule an autoclose RPC call
+ * @xprt: transport to disconnect
+ */
+static void xprt_schedule_autoclose_locked(struct rpc_xprt *xprt)
+{
+       set_bit(XPRT_CLOSE_WAIT, &xprt->state);
+       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))
+               rpc_wake_up_queued_task_set_status(&xprt->pending,
+                                                  xprt->snd_task, -ENOTCONN);
+}
+
 /**
  * xprt_force_disconnect - force a transport to disconnect
  * @xprt: transport to disconnect
@@ -772,13 +786,7 @@ void xprt_force_disconnect(struct rpc_xprt *xprt)
 
        /* Don't race with the test_bit() in xprt_clear_locked() */
        spin_lock(&xprt->transport_lock);
-       set_bit(XPRT_CLOSE_WAIT, &xprt->state);
-       /* Try to schedule an autoclose RPC call */
-       if (test_and_set_bit(XPRT_LOCKED, &xprt->state) == 0)
-               queue_work(xprtiod_workqueue, &xprt->task_cleanup);
-       else if (xprt->snd_task)
-               rpc_wake_up_queued_task_set_status(&xprt->pending,
-                               xprt->snd_task, -ENOTCONN);
+       xprt_schedule_autoclose_locked(xprt);
        spin_unlock(&xprt->transport_lock);
 }
 EXPORT_SYMBOL_GPL(xprt_force_disconnect);
@@ -818,11 +826,7 @@ void xprt_conditional_disconnect(struct rpc_xprt *xprt, unsigned int cookie)
                goto out;
        if (test_bit(XPRT_CLOSING, &xprt->state))
                goto out;
-       set_bit(XPRT_CLOSE_WAIT, &xprt->state);
-       /* Try to schedule an autoclose RPC call */
-       if (test_and_set_bit(XPRT_LOCKED, &xprt->state) == 0)
-               queue_work(xprtiod_workqueue, &xprt->task_cleanup);
-       xprt_wake_pending_tasks(xprt, -EAGAIN);
+       xprt_schedule_autoclose_locked(xprt);
 out:
        spin_unlock(&xprt->transport_lock);
 }
@@ -880,12 +884,14 @@ bool xprt_lock_connect(struct rpc_xprt *xprt,
                goto out;
        if (xprt->snd_task != task)
                goto out;
+       set_bit(XPRT_SND_IS_COOKIE, &xprt->state);
        xprt->snd_task = cookie;
        ret = true;
 out:
        spin_unlock(&xprt->transport_lock);
        return ret;
 }
+EXPORT_SYMBOL_GPL(xprt_lock_connect);
 
 void xprt_unlock_connect(struct rpc_xprt *xprt, void *cookie)
 {
@@ -895,12 +901,14 @@ void xprt_unlock_connect(struct rpc_xprt *xprt, void *cookie)
        if (!test_bit(XPRT_LOCKED, &xprt->state))
                goto out;
        xprt->snd_task =NULL;
+       clear_bit(XPRT_SND_IS_COOKIE, &xprt->state);
        xprt->ops->release_xprt(xprt, NULL);
        xprt_schedule_autodisconnect(xprt);
 out:
        spin_unlock(&xprt->transport_lock);
        wake_up_bit(&xprt->state, XPRT_LOCKED);
 }
+EXPORT_SYMBOL_GPL(xprt_unlock_connect);
 
 /**
  * xprt_connect - schedule a transport connect operation