LTS Refresh: Merge upto b3afef746221625d3f73a5c8017bfeacac886ba5 (buildnumber: 16108.717.0) from main-R89-cos-5.4 to release-R89-cos-5.4.
BUG=b/233791002,b/227987542,b/232378933,b/236112313,b/236112279,b/236112154,b/236112098,b/236111842,b/235677895,b/235677725,b/236112153,b/236112312,b/235458675,b/227582215
TEST=presubmit
RELEASE_NOTE=LTS Refresh from main-R89-cos-5.4 to release-R89-cos-5.4
Signed-off-by: Arnav Kansal <rnv@google.com>
Change-Id: I81ccb6358a529675b47af51a272cdae4784235b2
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);
