SUNRPC: SOFTCONN tasks should time out when on the sending list

SOFTCONN tasks need to periodically check if the transport is still
connected, so that they can time out if that is not the case.

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

diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index ab453ede54f0cd7be590495952a3feb71d92aef1..2364c485540c66fd32ba089bb014628842b468a4 100644 (file)
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -283,7 +283,7 @@ out_unlock:
        xprt_clear_locked(xprt);
 out_sleep:
        task->tk_status = -EAGAIN;
-       if  (RPC_IS_SOFT(task))
+       if (RPC_IS_SOFT(task) || RPC_IS_SOFTCONN(task))
                rpc_sleep_on_timeout(&xprt->sending, task, NULL,
                                xprt_request_timeout(req));
        else
@@ -349,7 +349,7 @@ out_unlock:
        xprt_clear_locked(xprt);
 out_sleep:
        task->tk_status = -EAGAIN;
-       if (RPC_IS_SOFT(task))
+       if (RPC_IS_SOFT(task) || RPC_IS_SOFTCONN(task))
                rpc_sleep_on_timeout(&xprt->sending, task, NULL,
                                xprt_request_timeout(req));
        else