commit 0d78fd9c70bf05801e1ff106a1f3815a7434f242
author He Gao <hegao@google.com> Fri Jul 08 00:06:51 2022 +0000
committer He Gao <hegao@google.com> Fri Jul 08 00:06:51 2022 +0000
tree ff53d3032ee7519ee1e8bd9d6bbfdfa73b93c8e2
parent 18245f66be8e793f5794e822ebaca4406d1a101b
parent ed2592bef15e8309dc47eb5c70ff090451155640

LTS Refresh: Merge upto ed2592bef15e8309dc47eb5c70ff090451155640 (buildnumber: 13310.1498.0) from main-R85-13310.B-cos-5.4 to release-R85-13310.B-cos-5.4.

BUG=b/238366064
TEST=presubmit
RELEASE_NOTE=LTS Refresh from main-R85-13310.B-cos-5.4 to release-R85-13310.B-cos-5.4

Signed-off-by: He Gao <hegao@google.com>
Change-Id: I3e18e2b80233c93d307a280ce55bc891e36e17a8

net/sunrpc/xprtsock.c

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 81f0e03..87ebcaf 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -2485,7 +2485,7 @@
 
 	WARN_ON_ONCE(!xprt_lock_connect(xprt, task, transport));
 
-	if (transport->sock != NULL) {
+	if (transport->sock != NULL && !xprt_connecting(xprt)) {
 		dprintk("RPC:       xs_connect delayed xprt %p for %lu "
 			"seconds\n", xprt, xprt->reestablish_timeout / HZ);