smb: server: make use of smbdirect_socket_destroy_sync()

This is basically the same logic as before, but we now
use common code, which will also be used by the server soon.

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 0cb3c7f24edc378b7f28513cd45f58aab74e0e84..fbc9d31cde0531bb7607008e3d17b03f9aa856e3 100644 (file)
--- a/fs/smb/server/transport_rdma.c
+++ b/fs/smb/server/transport_rdma.c
@@ -302,57 +302,9 @@ static void smb_direct_free_transport(struct ksmbd_transport *kt)
 static void free_transport(struct smb_direct_transport *t)
 {
        struct smbdirect_socket *sc = &t->socket;
-       struct smbdirect_recv_io *recvmsg;
-
-       disable_work_sync(&sc->disconnect_work);
-       if (sc->status < SMBDIRECT_SOCKET_DISCONNECTING)
-               smbdirect_socket_cleanup_work(&sc->disconnect_work);
-       if (sc->status < SMBDIRECT_SOCKET_DISCONNECTED)
-               wait_event(sc->status_wait, sc->status == SMBDIRECT_SOCKET_DISCONNECTED);
-
-       /*
-        * Wake up all waiters in all wait queues
-        * in order to notice the broken connection.
-        *
-        * Most likely this was already called via
-        * smbdirect_socket_cleanup_work(), but call it again...
-        */
-       smbdirect_socket_wake_up_all(sc);
-
-       disable_work_sync(&sc->connect.work);
-       disable_work_sync(&sc->recv_io.posted.refill_work);
-       disable_delayed_work_sync(&sc->idle.timer_work);
-       disable_work_sync(&sc->idle.immediate_work);
-
-       if (sc->rdma.cm_id)
-               rdma_lock_handler(sc->rdma.cm_id);
 
-       if (sc->ib.qp)
-               ib_drain_qp(sc->ib.qp);
-
-       ksmbd_debug(RDMA, "drain the reassembly queue\n");
-       do {
-               unsigned long flags;
-
-               spin_lock_irqsave(&sc->recv_io.reassembly.lock, flags);
-               recvmsg = smbdirect_connection_reassembly_first_recv_io(sc);
-               if (recvmsg) {
-                       list_del(&recvmsg->list);
-                       spin_unlock_irqrestore(&sc->recv_io.reassembly.lock, flags);
-                       smbdirect_connection_put_recv_io(recvmsg);
-               } else {
-                       spin_unlock_irqrestore(&sc->recv_io.reassembly.lock, flags);
-               }
-       } while (recvmsg);
-       sc->recv_io.reassembly.data_length = 0;
-
-       smbdirect_connection_destroy_qp(sc);
-       if (sc->rdma.cm_id) {
-               rdma_unlock_handler(sc->rdma.cm_id);
-               rdma_destroy_id(sc->rdma.cm_id);
-       }
+       smbdirect_socket_destroy_sync(sc);
 
-       smbdirect_connection_destroy_mem_pools(sc);
        ksmbd_conn_free(KSMBD_TRANS(t)->conn);
 }