| From a275ab62606bcd894ddff09460f7d253828313dc Mon Sep 17 00:00:00 2001 |
| From: Trond Myklebust <trond.myklebust@hammerspace.com> |
| Date: Sun, 17 Sep 2023 19:26:46 -0400 |
| Subject: Revert "SUNRPC dont update timeout value on connection reset" |
| |
| From: Trond Myklebust <trond.myklebust@hammerspace.com> |
| |
| commit a275ab62606bcd894ddff09460f7d253828313dc upstream. |
| |
| This reverts commit 88428cc4ae7abcc879295fbb19373dd76aad2bdd. |
| |
| The problem this commit is intended to fix was comprehensively fixed |
| in commit 7de62bc09fe6 ("SUNRPC dont update timeout value on connection |
| reset"). |
| Since then, this commit has been preventing the correct timeout of soft |
| mounted requests. |
| |
| Cc: stable@vger.kernel.org # 5.9.x: 09252177d5f9: SUNRPC: Handle major timeout in xprt_adjust_timeout() |
| Cc: stable@vger.kernel.org # 5.9.x: 7de62bc09fe6: SUNRPC dont update timeout value on connection reset |
| Cc: stable@vger.kernel.org # 5.9.x |
| Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> |
| Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/sunrpc/clnt.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/net/sunrpc/clnt.c |
| +++ b/net/sunrpc/clnt.c |
| @@ -2474,8 +2474,7 @@ call_status(struct rpc_task *task) |
| goto out_exit; |
| } |
| task->tk_action = call_encode; |
| - if (status != -ECONNRESET && status != -ECONNABORTED) |
| - rpc_check_timeout(task); |
| + rpc_check_timeout(task); |
| return; |
| out_exit: |
| rpc_call_rpcerror(task, status); |
