stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: longli@linuxonhyperv.com
To: Steve French <sfrench@samba.org>,
	linux-cifs@vger.kernel.org, samba-technical@lists.samba.org,
	linux-kernel@vger.kernel.org
Cc: Long Li <longli@microsoft.com>, stable@vger.kernel.org
Subject: [PATCH 7/7] cifs: smbd: Return -EAGAIN when transport is reconnecting
Date: Wed, 16 Oct 2019 13:51:56 -0700	[thread overview]
Message-ID: <1571259116-102015-8-git-send-email-longli@linuxonhyperv.com> (raw)
In-Reply-To: <1571259116-102015-1-git-send-email-longli@linuxonhyperv.com>

From: Long Li <longli@microsoft.com>

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
---
 fs/cifs/transport.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index afe66f9cb15e..66fde7bfec4f 100644
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -318,8 +318,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;
 	}
 
-- 
2.17.1


  parent reply	other threads:[~2019-10-16 20:52 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1571259116-102015-1-git-send-email-longli@linuxonhyperv.com>
2019-10-16 20:51 ` [PATCH 1/7] cifs: Don't display RDMA transport on reconnect longli
2019-10-16 20:51 ` [PATCH 2/7] cifs: smbd: Invalidate and deregister memory registration on re-send longli
2019-10-16 20:51 ` [PATCH 3/7] cifs: smbd: Return -EINVAL when the number of iovs exceeds SMBDIRECT_MAX_SGE longli
2019-10-16 20:51 ` [PATCH 4/7] cifs: smbd: Add messages on RDMA session destroy and reconnection longli
2019-10-16 20:51 ` [PATCH 5/7] cifs: smbd: Return -ECONNABORTED when trasnport is not in connected state longli
2019-10-16 20:51 ` [PATCH 6/7] cifs: smbd: Only queue work for error recovery on memory registration longli
2019-10-27 19:59   ` Steve French
2019-10-16 20:51 ` longli [this message]
2019-10-27 20:02   ` [PATCH 7/7] cifs: smbd: Return -EAGAIN when transport is reconnecting Steve French

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1571259116-102015-8-git-send-email-longli@linuxonhyperv.com \
    --to=longli@linuxonhyperv.com \
    --cc=linux-cifs@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=longli@microsoft.com \
    --cc=samba-technical@lists.samba.org \
    --cc=sfrench@samba.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).