From: Trond Myklebust <trond.myklebust@hammerspace.com>
Date: Sun, 17 Sep 2023 15:26:27 +0000 (-0400)
Subject: SUNRPC: Don't skip timeout checks in call_connect_status()
X-Git-Tag: v6.7-rc1~30^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=caa388f7e54ba4ec603f9aeb2705d75adbddea20;p=thirdparty%2Fkernel%2Fstable.git

SUNRPC: Don't skip timeout checks in call_connect_status()

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
---

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index f6074a4b9eabf..e49c11ef7c500 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -2220,7 +2220,7 @@ call_connect_status(struct rpc_task *task)
 			}
 			xprt_switch_put(xps);
 			if (!task->tk_xprt)
-				return;
+				goto out;
 		}
 		goto out_retry;
 	case -ENOBUFS:
@@ -2235,6 +2235,7 @@ out_next:
 out_retry:
 	/* Check for timeouts before looping back to call_bind */
 	task->tk_action = call_bind;
+out:
 	rpc_check_timeout(task);
 }