Commit 8059c640 authored by Stefan Metzmacher's avatar Stefan Metzmacher Committed by Steve French
Browse files

smb: server: smb_direct_disconnect_rdma_connection() already wakes all waiters on error 



There's no need to care about pending or credit counters when we
already disconnecting.

And all related wait_event conditions already check for broken
connections too.

This will simplify the code and makes the following changes simpler.

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: default avatarStefan Metzmacher <metze@samba.org>
Acked-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 68335cbc

fs/smb/server/transport_rdma.c

+0 −4
Original line number Diff line number Diff line
@@ -987,8 +987,6 @@ static int smb_direct_post_send(struct smbdirect_socket *sc, 
	ret = ib_post_send(sc->ib.qp, wr, NULL);

	if (ret) {

		pr_err("failed to post send: %d\n", ret);

		if (atomic_dec_and_test(&sc->send_io.pending.count))

			wake_up(&sc->send_io.pending.zero_wait_queue);

		smb_direct_disconnect_rdma_connection(sc);

	}

	return ret;
@@ -1037,8 +1035,6 @@ static int smb_direct_flush_send_list(struct smbdirect_socket *sc, 
					 send_ctx->need_invalidate_rkey,

					 send_ctx->remote_key);

	} else {

		atomic_add(send_ctx->wr_cnt, &sc->send_io.credits.count);

		wake_up(&sc->send_io.credits.wait_queue);

		list_for_each_entry_safe(first, last, &send_ctx->msg_list,

					 sibling_list) {

			smb_direct_free_sendmsg(sc, first);