Skip to content

Commit a275ab6

Browse files
Trond Myklebustamschuma-ntap
authored andcommitted
Revert "SUNRPC dont update timeout value on connection reset"
This reverts commit 88428cc. The problem this commit is intended to fix was comprehensively fixed in commit 7de62bc ("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: 0925217: SUNRPC: Handle major timeout in xprt_adjust_timeout() Cc: stable@vger.kernel.org # 5.9.x: 7de62bc: 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>
1 parent 956fd46 commit a275ab6

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

net/sunrpc/clnt.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2476,8 +2476,7 @@ call_status(struct rpc_task *task)
24762476
goto out_exit;
24772477
}
24782478
task->tk_action = call_encode;
2479-
if (status != -ECONNRESET && status != -ECONNABORTED)
2480-
rpc_check_timeout(task);
2479+
rpc_check_timeout(task);
24812480
return;
24822481
out_exit:
24832482
rpc_call_rpcerror(task, status);

0 commit comments

Comments
 (0)