This is a note to let you know that I've just added the patch titled
Revert "SUNRPC dont update timeout value on connection reset"
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-sunrpc-dont-update-timeout-value-on-connection-reset.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From a275ab62606bcd894ddff09460f7d253828313dc Mon Sep 17 00:00:00 2001
From: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
Date: Sun, 17 Sep 2023 19:26:46 -0400
Subject: Revert "SUNRPC dont update timeout value on connection reset"
From: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxx # 5.9.x: 09252177d5f9: SUNRPC: Handle major timeout in xprt_adjust_timeout()
Cc: stable@xxxxxxxxxxxxxxx # 5.9.x: 7de62bc09fe6: SUNRPC dont update timeout value on connection reset
Cc: stable@xxxxxxxxxxxxxxx # 5.9.x
Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
Signed-off-by: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/sunrpc/clnt.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- 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);
Patches currently in stable-queue which might be from trond.myklebust@xxxxxxxxxxxxxxx are
queue-6.1/nfs-fix-o_direct-locking-issues.patch
queue-6.1/sunrpc-mark-the-cred-for-revalidation-if-the-server-.patch
queue-6.1/nfs-pnfs-report-einval-errors-from-connect-to-the-se.patch
queue-6.1/nfs-more-fixes-for-nfs_direct_write_reschedule_io.patch
queue-6.1/nfs-use-the-correct-commit-info-in-nfs_join_page_gro.patch
queue-6.1/nfs-more-o_direct-accounting-fixes-for-error-paths.patch
queue-6.1/revert-sunrpc-dont-update-timeout-value-on-connection-reset.patch
queue-6.1/nfs-fix-error-handling-for-o_direct-write-scheduling.patch
