smb: server: move smb_direct_disconnect_rdma_work() into free_transport()

The logic is also needed when smb_direct_handle_connect_request()
calls free_transport(), because rdma_accept() and RDMA_CM_EVENT_ESTABLISHED
could already be reached.

Cc: Namjae Jeon <linkinjeon@kernel.org>
Cc: Steve French <smfrench@gmail.com>
Cc: Tom Talpey <tom@talpey.com>
Cc: linux-cifs@vger.kernel.org
Cc: samba-technical@lists.samba.org
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/smb/server/transport_rdma.c b/fs/smb/server/transport_rdma.c
index c5850dcf2e19c360c370bfff19bc18b300767e1e..298c7e060db6552dde84c0063340929f4921e401 100644 (file)
--- a/fs/smb/server/transport_rdma.c
+++ b/fs/smb/server/transport_rdma.c
@@ -381,13 +381,19 @@ static void free_transport(struct smb_direct_transport *t)
        struct smbdirect_socket *sc = &t->socket;
        struct smbdirect_recv_io *recvmsg;
 
+       disable_work_sync(&t->disconnect_work);
+       if (sc->status < SMBDIRECT_SOCKET_DISCONNECTING) {
+               smb_direct_disconnect_rdma_work(&t->disconnect_work);
+               wait_event_interruptible(sc->status_wait,
+                                        sc->status == SMBDIRECT_SOCKET_DISCONNECTED);
+       }
+
        wake_up_all(&t->wait_send_credits);
 
        ksmbd_debug(RDMA, "wait for all send posted to IB to finish\n");
        wait_event(t->wait_send_pending,
                   atomic_read(&t->send_pending) == 0);
 
-       disable_work_sync(&t->disconnect_work);
        disable_work_sync(&t->post_recv_credits_work);
        disable_work_sync(&t->send_immediate_work);
 
@@ -1551,9 +1557,6 @@ static void smb_direct_disconnect(struct ksmbd_transport *t)
 
        ksmbd_debug(RDMA, "Disconnecting cm_id=%p\n", sc->rdma.cm_id);
 
-       smb_direct_disconnect_rdma_work(&st->disconnect_work);
-       wait_event_interruptible(sc->status_wait,
-                                sc->status == SMBDIRECT_SOCKET_DISCONNECTED);
        free_transport(st);
 }