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

Trond Myklebust · Trond Myklebust · commit caa388f7e54b · 2023-10-22T19:47:56.000-04:00
Signed-off-by: Trond Myklebust &lt;trond.myklebust@hammerspace.com&gt;
diff --git 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 @@ call_connect_status(struct rpc_task *task)
 out_retry:
 	/* Check for timeouts before looping back to call_bind */
 	task->tk_action = call_bind;
+out:
 	rpc_check_timeout(task);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2220,7 +2220,7 @@ call_connect_status(struct rpc_task *task)`
`2220`	`2220`	`}`
`2221`	`2221`	`xprt_switch_put(xps);`
`2222`	`2222`	`if (!task->tk_xprt)`
`2223`		`- return;`
	`2223`	`+ goto out;`
`2224`	`2224`	`}`
`2225`	`2225`	`goto out_retry;`
`2226`	`2226`	`case -ENOBUFS:`
`@@ -2235,6 +2235,7 @@ call_connect_status(struct rpc_task *task)`
`2235`	`2235`	`out_retry:`
`2236`	`2236`	`/* Check for timeouts before looping back to call_bind */`
`2237`	`2237`	`task->tk_action = call_bind;`
	`2238`	`+out:`
`2238`	`2239`	`rpc_check_timeout(task);`
`2239`	`2240`	`}`
`2240`	`2241`