commit 883fa318b429edb0e19a887572aef5438e65eec3
author Robert Kolchmeyer <rkolchmeyer@google.com> Thu Jan 12 16:40:51 2023 -0800
committer Robert Kolchmeyer <rkolchmeyer@google.com> Thu Jan 12 16:40:51 2023 -0800
tree e0138f1a499cc108c0c9c15b0e718b2a4c720959
parent ff022a181798d58b6c59830898a64d2e7b9569ea
parent a24def748523aa1d6585ada42812da785f79969b

LTS Refresh: Merge upto a24def748523aa1d6585ada42812da785f79969b (buildnumber: 16108.798.0) from main-R89-cos-5.4 to release-R89-cos-5.4.

BUG=b/265334296
TEST=presubmit
RELEASE_NOTE=LTS Refresh from main-R89-cos-5.4 to release-R89-cos-5.4

Change-Id: I5acc4c0f3ef79f6718413e9da01d0ae45d6f8aaf

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);