| From 6676df15a59a98ac69f33488f8f898f10941af98 Mon Sep 17 00:00:00 2001 |
| From: Trond Myklebust <trondmy@gmail.com> |
| Date: Mon, 6 Jan 2020 15:25:01 -0500 |
| Subject: [PATCH] NFS: Revalidate the file mapping on all fatal writeback |
| errors |
| |
| commit b8946d7bfb9417ec171693d4478a831420aead5f upstream. |
| |
| 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/nfs/write.c b/fs/nfs/write.c |
| index 52b01508b9d5..45013144ed31 100644 |
| --- a/fs/nfs/write.c |
| +++ b/fs/nfs/write.c |
| @@ -248,8 +248,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); |
| } |
| |
| /* |
| @@ -592,7 +595,6 @@ nfs_lock_and_join_requests(struct page *page) |
| |
| static void nfs_write_error(struct nfs_page *req, int error) |
| { |
| - nfs_set_pageerror(page_file_mapping(req->wb_page)); |
| nfs_mapping_set_error(req->wb_page, error); |
| nfs_inode_remove_request(req); |
| nfs_end_page_writeback(req); |
| @@ -1001,7 +1003,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)); |
| nfs_mapping_set_error(req->wb_page, hdr->error); |
| goto remove_req; |
| } |
| -- |
| 2.7.4 |
| |
