From: Trond Myklebust <trond.myklebust@hammerspace.com>
Date: Sat, 14 May 2022 14:27:00 +0000 (-0400)
Subject: NFS: Do not report EINTR/ERESTARTSYS as mapping errors
X-Git-Tag: v5.10.121~125
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=418b9fa4349a0479e6c3a9407a3ca208abd87bec;p=users%2Fdwmw2%2Flinux.git

NFS: Do not report EINTR/ERESTARTSYS as mapping errors

[ 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 <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 5d07799513a65..b08323ed0c25a 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1411,7 +1411,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);