NFS: Revalidate the file mapping on all fatal writeback errors

If a write or commit failed, and the mapping sees a fatal error, we
need to revalidate the contents of that mapping.

Fixes: 06c9fdf3b9f1 ("NFS: On fatal writeback errors, we need to call nfs_inode_remove_request()")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index adedc16780c54887686a7efeeb0bdbd06e7493d4..6dd8d6e6d847ac5336d605de13b1bdce04f9ab85 100644 (file)
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -256,8 +256,11 @@ static void nfs_set_pageerror(struct address_space *mapping)
 
 static void nfs_mapping_set_error(struct page *page, int error)
 {
+       struct address_space *mapping = page_file_mapping(page);
+
        SetPageError(page);
-       mapping_set_error(page_file_mapping(page), error);
+       mapping_set_error(mapping, error);
+       nfs_set_pageerror(mapping);
 }
 
 /*
@@ -600,7 +603,6 @@ release_request:
 
 static void nfs_write_error(struct nfs_page *req, int error)
 {
-       nfs_set_pageerror(page_file_mapping(req->wb_page));
        trace_nfs_write_error(req, error);
        nfs_mapping_set_error(req->wb_page, error);
        nfs_inode_remove_request(req);
@@ -1007,7 +1009,6 @@ static void nfs_write_completion(struct nfs_pgio_header *hdr)
                nfs_list_remove_request(req);
                if (test_bit(NFS_IOHDR_ERROR, &hdr->flags) &&
                    (hdr->good_bytes < bytes)) {
-                       nfs_set_pageerror(page_file_mapping(req->wb_page));
                        trace_nfs_comp_error(req, hdr->error);
                        nfs_mapping_set_error(req->wb_page, hdr->error);
                        goto remove_req;