NFS: Further fixes to the writeback error handling

When we handle an error by redirtying the page, we're not corrupting the
mapping, so we don't want the error to be recorded in the mapping.
If the caller has specified a sync_mode of WB_SYNC_NONE, we can just
return AOP_WRITEPAGE_ACTIVATE. However if we're dealing with
WB_SYNC_ALL, we need to ensure that retries happen when the errors are
non-fatal.

Reported-by: Olga Kornievskaia <aglo@umich.edu>
Fixes: 8fc75bed96bb ("NFS: Fix up return value on fatal errors in nfs_page_async_flush()")
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 4925d11849cdeb91b16094fbe5fdd2ffc797cb5c..2f41659e232e373fdf7ee93807c943f4e2e64bce 100644 (file)
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -603,8 +603,9 @@ static void nfs_write_error(struct nfs_page *req, int error)
  * Find an associated nfs write request, and prepare to flush it out
  * May return an error if the user signalled nfs_wait_on_request().
  */
-static int nfs_page_async_flush(struct nfs_pageio_descriptor *pgio,
-                               struct page *page)
+static int nfs_page_async_flush(struct page *page,
+                               struct writeback_control *wbc,
+                               struct nfs_pageio_descriptor *pgio)
 {
        struct nfs_page *req;
        int ret = 0;
@@ -630,11 +631,11 @@ static int nfs_page_async_flush(struct nfs_pageio_descriptor *pgio,
                /*
                 * Remove the problematic req upon fatal errors on the server
                 */
-               if (nfs_error_is_fatal(ret)) {
-                       if (nfs_error_is_fatal_on_server(ret))
-                               goto out_launder;
-               } else
-                       ret = -EAGAIN;
+               if (nfs_error_is_fatal_on_server(ret))
+                       goto out_launder;
+               if (wbc->sync_mode == WB_SYNC_NONE)
+                       ret = AOP_WRITEPAGE_ACTIVATE;
+               redirty_page_for_writepage(wbc, page);
                nfs_redirty_request(req);
                pgio->pg_error = 0;
        } else
@@ -650,15 +651,8 @@ out_launder:
 static int nfs_do_writepage(struct page *page, struct writeback_control *wbc,
                            struct nfs_pageio_descriptor *pgio)
 {
-       int ret;
-
        nfs_pageio_cond_complete(pgio, page_index(page));
-       ret = nfs_page_async_flush(pgio, page);
-       if (ret == -EAGAIN) {
-               redirty_page_for_writepage(wbc, page);
-               ret = AOP_WRITEPAGE_ACTIVATE;
-       }
-       return ret;
+       return nfs_page_async_flush(page, wbc, pgio);
 }
 
 /*
@@ -733,12 +727,15 @@ int nfs_writepages(struct address_space *mapping, struct writeback_control *wbc)
                priority = wb_priority(wbc);
        }
 
-       nfs_pageio_init_write(&pgio, inode, priority, false,
-                               &nfs_async_write_completion_ops);
-       pgio.pg_io_completion = ioc;
-       err = write_cache_pages(mapping, wbc, nfs_writepages_callback, &pgio);
-       pgio.pg_error = 0;
-       nfs_pageio_complete(&pgio);
+       do {
+               nfs_pageio_init_write(&pgio, inode, priority, false,
+                                     &nfs_async_write_completion_ops);
+               pgio.pg_io_completion = ioc;
+               err = write_cache_pages(mapping, wbc, nfs_writepages_callback,
+                                       &pgio);
+               pgio.pg_error = 0;
+               nfs_pageio_complete(&pgio);
+       } while (err < 0 && !nfs_error_is_fatal(err));
        nfs_io_completion_put(ioc);
 
        if (err < 0)