LTS Refresh: Merge upto 88467ee05d6f2acfdfe8c0acd47de6a940b9df0b (buildnumber: 16108.766.0) from main-R89-cos-5.4 to release-R89-cos-5.4.
BUG=b/241559709,b/237764736,b/237764889,b/237764641,b/238861887,b/238861617,b/238861713,b/238861755,b/238861945,b/238861888,b/238861618,b/238861714,b/238861757,b/238861947,b/238861889,b/238861619,b/238861715,b/239161411,b/239800422,b/239800699,b/239800831,b/240724910,b/237764635,b/237764673,b/237764780,b/238604305,b/238604035,b/238604325,b/238604138,b/238604238,b/238604306,b/238604036,b/238604327,b/238604379,b/238604399,b/238604307,b/238861616,b/238861712,b/239161712,b/239800828,b/239800905,b/239800924,b/240725195,b/244292023,b/242224925,b/246739722,b/246739910,b/246068617,b/246068881,b/245910738,b/245910543,b/244706512,b/244706495,b/244706492,b/244706662,b/244077506,b/244077643,b/244077170,b/244077600,b/243913841,b/243913680,b/243914072,b/243913863,b/243227426,b/243227428,b/243227212,b/243227214,b/243227469,b/243227471,b/243227562,b/243227564,b/243227256,b/243227259,b/242839867,b/242839809,b/242840024,b/242839214,b/242840239,b/242839866,b/241632833,b/241632406,b/241632679,b/241632674,b/241632949,b/241632164,b/241632929,b/241632504
TEST=presubmit
RELEASE_NOTE=LTS Refresh from main-R89-cos-5.4 to release-R89-cos-5.4
Change-Id: Ifcf6d5d35402d1c414f9506a71d6c62079f23e5e
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);
