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: 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 daaa4f56b074dbcc3d4c1b3df5949d3ca87f40c9..f47cf3e8c720a4c706192c3587fbec325239b097 100644 (file)
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -675,11 +675,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;
+       return err;
 }
 
 int nfs_writepage(struct page *page, struct writeback_control *wbc)
@@ -737,9 +733,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;