From: Long Li <longli@microsoft.com>
Date: Wed, 16 Oct 2019 20:51:56 +0000 (-0700)
Subject: cifs: smbd: Return -EAGAIN when transport is reconnecting
X-Git-Tag: v5.4.6~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77d0084bde9c84331036093121f56345c8e765d3;p=thirdparty%2Fkernel%2Fstable.git

cifs: smbd: Return -EAGAIN when transport is reconnecting

commit 4357d45f50e58672e1d17648d792f27df01dfccd upstream.

During reconnecting, the transport may have already been destroyed and is in
the process being reconnected. In this case, return -EAGAIN to not fail and
to retry this I/O.

Signed-off-by: Long Li <longli@microsoft.com>
Cc: stable@vger.kernel.org
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index ca3de62688d6e..e9e3a0909ff14 100644
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -319,8 +319,11 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst,
 	int val = 1;
 	__be32 rfc1002_marker;
 
-	if (cifs_rdma_enabled(server) && server->smbd_conn) {
-		rc = smbd_send(server, num_rqst, rqst);
+	if (cifs_rdma_enabled(server)) {
+		/* return -EAGAIN when connecting or reconnecting */
+		rc = -EAGAIN;
+		if (server->smbd_conn)
+			rc = smbd_send(server, num_rqst, rqst);
 		goto smbd_done;
 	}