diff options
| author | Trond Myklebust <trond.myklebust@hammerspace.com> | 2023-09-17 19:26:46 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-10-06 14:57:03 +0200 |
| commit | f32340c70eb96372321b9084840e76dcdc1a455a (patch) | |
| tree | e7a8cfa65f869c5518c5f5c5d13e8f53dbec2c26 | |
| parent | 1e4c03d530d8368799a6cd3473c4e44ff2e36451 (diff) | |
| download | linux-stable-f32340c70eb96372321b9084840e76dcdc1a455a.tar.gz linux-stable-f32340c70eb96372321b9084840e76dcdc1a455a.tar.bz2 linux-stable-f32340c70eb96372321b9084840e76dcdc1a455a.zip | |
Revert "SUNRPC dont update timeout value on connection reset"
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>
| -rw-r--r-- | net/sunrpc/clnt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index b3f6f67ed252..2b803383c7b3 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -2462,8 +2462,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); |