Commit 3d216510 authored May 14, 2022 by Trond Myklebust Committed by Greg Kroah-Hartman Jun 14, 2022

NFS: Don't report errors from nfs_pageio_complete() more than once



[ Upstream commit c5e483b77cc2edb318da152abe07e33006b975fd ]

Since errors from nfs_pageio_complete() are already being reported
through nfs_async_write_error(), we should not be returning them to the
callers of do_writepages() as well. They will end up being reported
through the generic mechanism instead.

Fixes: 6fbda89b ("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>

parent 55f0fc32

fs/nfs/write.c

+1 −8

Original line number	Diff line number	Diff line
		@@ -692,11 +692,7 @@ static int nfs_writepage_locked(struct page *page,
		err = nfs_do_writepage(page, wbc, &pgio);
		pgio.pg_error = 0;
		nfs_pageio_complete(&pgio);
		if (err < 0)
		return err;
		if (nfs_error_is_fatal(pgio.pg_error))
		return pgio.pg_error;
		return 0;
		}

		int nfs_writepage(struct page page, struct writeback_control wbc)
		@@ -747,9 +743,6 @@ int nfs_writepages(struct address_space mapping, struct writeback_control wbc)

		if (err < 0)
		goto out_err;
		err = pgio.pg_error;
		if (nfs_error_is_fatal(err))
		goto out_err;
		return 0;
		out_err:
		return err;