From a1428a5f2140512abfbf2a22ad4fc84a077d9fe8 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Tue, 27 Sep 2022 21:10:24 +0800 Subject: [PATCH] NFS: Do not report EINTR/ERESTARTSYS as mapping errors stable inclusion from stable-v5.10.121 commit 418b9fa4349a0479e6c3a9407a3ca208abd87bec category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I5L6CQ Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=418b9fa4349a0479e6c3a9407a3ca208abd87bec -------------------------------- [ Upstream commit cea9ba7239dcc84175041174304c6cdeae3226e5 ] If the attempt to flush data was interrupted due to a local signal, then just requeue the writes back for I/O. Fixes: 6fbda89b257f ("NFS: Replace custom error reporting mechanism with generic one") Signed-off-by: Trond Myklebust Signed-off-by: Anna Schumaker Signed-off-by: Sasha Levin Signed-off-by: Zheng Zengkai Acked-by: Xie XiuQi --- fs/nfs/write.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/write.c b/fs/nfs/write.c index e8f6ce88b1fb..7504b75ed59c 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -1408,7 +1408,7 @@ static void nfs_async_write_error(struct list_head *head, int error) while (!list_empty(head)) { req = nfs_list_entry(head->next); nfs_list_remove_request(req); - if (nfs_error_is_fatal(error)) + if (nfs_error_is_fatal_on_server(error)) nfs_write_error(req, error); else nfs_redirty_request(req); -- GitLab