diff options
| author | Stefan Metzmacher <metze@samba.org> | 2025-08-13 11:39:19 +0200 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2025-09-28 18:29:52 -0500 |
| commit | b4d56ced9e9dc353484dcb6355c1fd7074609124 (patch) | |
| tree | f2f8ee4c8b870416e996e6143b29914dbc83fca1 | |
| parent | smb: server: move smb_direct_disconnect_rdma_work() into free_transport() (diff) | |
| download | linux-b4d56ced9e9dc353484dcb6355c1fd7074609124.tar.gz linux-b4d56ced9e9dc353484dcb6355c1fd7074609124.zip | |
smb: server: don't wait for info->send_pending == 0 on error
Instead we just wake up the waiters and let them return -ENOTCONN.
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>
| -rw-r--r-- | fs/smb/server/transport_rdma.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/fs/smb/server/transport_rdma.c b/fs/smb/server/transport_rdma.c index 298c7e060db6..4199a4f96635 100644 --- a/fs/smb/server/transport_rdma.c +++ b/fs/smb/server/transport_rdma.c @@ -389,10 +389,7 @@ static void free_transport(struct smb_direct_transport *t) } 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); + wake_up_all(&t->wait_send_pending); disable_work_sync(&t->post_recv_credits_work); disable_work_sync(&t->send_immediate_work); @@ -1356,7 +1353,11 @@ done: */ wait_event(st->wait_send_pending, - atomic_read(&st->send_pending) == 0); + atomic_read(&st->send_pending) == 0 || + sc->status != SMBDIRECT_SOCKET_CONNECTED); + if (sc->status != SMBDIRECT_SOCKET_CONNECTED && ret == 0) + ret = -ENOTCONN; + return ret; } @@ -1689,7 +1690,11 @@ static int smb_direct_send_negotiate_response(struct smb_direct_transport *t, } wait_event(t->wait_send_pending, - atomic_read(&t->send_pending) == 0); + atomic_read(&t->send_pending) == 0 || + sc->status != SMBDIRECT_SOCKET_CONNECTED); + if (sc->status != SMBDIRECT_SOCKET_CONNECTED) + return -ENOTCONN; + return 0; } |