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

smb: server: let free_transport() wait for SMBDIRECT_SOCKET_DISCONNECTED 



We should wait for the rdma_cm to become SMBDIRECT_SOCKET_DISCONNECTED!

At least on the client side (with similar code)
wait_event_interruptible() often returns with -ERESTARTSYS instead of
waiting for SMBDIRECT_SOCKET_DISCONNECTED.
We should use wait_event() here too, which makes the code be identical
in client and server, which will help when moving to common functions.

Fixes: b3160609 ("smb: server: move smb_direct_disconnect_rdma_work() into free_transport()")
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 123111ea

fs/smb/server/transport_rdma.c

+3 −4
Original line number Diff line number Diff line
@@ -451,11 +451,10 @@ static void free_transport(struct smb_direct_transport *t) 
	struct smbdirect_recv_io *recvmsg;



	disable_work_sync(&sc->disconnect_work);

	if (sc->status < SMBDIRECT_SOCKET_DISCONNECTING) {

	if (sc->status < SMBDIRECT_SOCKET_DISCONNECTING)

		smb_direct_disconnect_rdma_work(&sc->disconnect_work);

		wait_event_interruptible(sc->status_wait,

					 sc->status == SMBDIRECT_SOCKET_DISCONNECTED);

	}

	if (sc->status < SMBDIRECT_SOCKET_DISCONNECTED)

		wait_event(sc->status_wait, sc->status == SMBDIRECT_SOCKET_DISCONNECTED);



	/*

	 * Wake up all waiters in all wait queues