1 files changed, 16 insertions, 22 deletions

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 92d9cadc6102..85ca49549b39 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -57,6 +57,7 @@ static const struct rpc_call_ops nfs_commit_ops;
 static const struct nfs_pgio_completion_ops nfs_async_write_completion_ops;
 static const struct nfs_commit_completion_ops nfs_commit_completion_ops;
 static const struct nfs_rw_ops nfs_rw_write_ops;
+static void nfs_inode_remove_request(struct nfs_page *req);
 static void nfs_clear_request_commit(struct nfs_page *req);
 static void nfs_init_cinfo_from_inode(struct nfs_commit_info *cinfo,
                                       struct inode *inode);
@@ -591,23 +592,13 @@ release_request:
 
 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);
         nfs_release_request(req);
 }
 
-static bool
-nfs_error_is_fatal_on_server(int err)
-{
-        switch (err) {
-        case 0:
-        case -ERESTARTSYS:
-        case -EINTR:
-                return false;
-        }
-        return nfs_error_is_fatal(err);
-}
-
 /*
  * Find an associated nfs write request, and prepare to flush it out
  * May return an error if the user signalled nfs_wait_on_request().
@@ -615,7 +606,6 @@ nfs_error_is_fatal_on_server(int err)
 static int nfs_page_async_flush(struct nfs_pageio_descriptor *pgio,
                                 struct page *page)
 {
-        struct address_space *mapping;
         struct nfs_page *req;
         int ret = 0;
 
@@ -630,12 +620,11 @@ static int nfs_page_async_flush(struct nfs_pageio_descriptor *pgio,
         WARN_ON_ONCE(test_bit(PG_CLEAN, &req->wb_flags));
 
         /* If there is a fatal error that covers this write, just exit */
-        ret = 0;
-        mapping = page_file_mapping(page);
-        if (test_bit(AS_ENOSPC, &mapping->flags) ||
-            test_bit(AS_EIO, &mapping->flags))
+        ret = pgio->pg_error;
+        if (nfs_error_is_fatal_on_server(ret))
                 goto out_launder;
 
+        ret = 0;
         if (!nfs_pageio_add_request(pgio, req)) {
                 ret = pgio->pg_error;
                 /*
@@ -647,6 +636,7 @@ static int nfs_page_async_flush(struct nfs_pageio_descriptor *pgio,
                 } else
                         ret = -EAGAIN;
                 nfs_redirty_request(req);
+                pgio->pg_error = 0;
         } else
                 nfs_add_stats(page_file_mapping(page)->host,
                                 NFSIOS_WRITEPAGES, 1);
@@ -666,7 +656,7 @@ static int nfs_do_writepage(struct page *page, struct writeback_control *wbc,
         ret = nfs_page_async_flush(pgio, page);
         if (ret == -EAGAIN) {
                 redirty_page_for_writepage(wbc, page);
-                ret = 0;
+                ret = AOP_WRITEPAGE_ACTIVATE;
         }
         return ret;
 }
@@ -685,10 +675,11 @@ static int nfs_writepage_locked(struct page *page,
         nfs_pageio_init_write(&pgio, inode, 0,
                                 false, &nfs_async_write_completion_ops);
         err = nfs_do_writepage(page, wbc, &pgio);
+        pgio.pg_error = 0;
         nfs_pageio_complete(&pgio);
         if (err < 0)
                 return err;
-        if (pgio.pg_error < 0)
+        if (nfs_error_is_fatal(pgio.pg_error))
                 return pgio.pg_error;
         return 0;
 }
@@ -698,7 +689,8 @@ int nfs_writepage(struct page *page, struct writeback_control *wbc)
         int ret;
 
         ret = nfs_writepage_locked(page, wbc);
-        unlock_page(page);
+        if (ret != AOP_WRITEPAGE_ACTIVATE)
+                unlock_page(page);
         return ret;
 }
 
@@ -707,7 +699,8 @@ static int nfs_writepages_callback(struct page *page, struct writeback_control *
         int ret;
 
         ret = nfs_do_writepage(page, wbc, data);
-        unlock_page(page);
+        if (ret != AOP_WRITEPAGE_ACTIVATE)
+                unlock_page(page);
         return ret;
 }
 
@@ -733,13 +726,14 @@ int nfs_writepages(struct address_space *mapping, struct writeback_control *wbc)
                                 &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);
         nfs_io_completion_put(ioc);
 
         if (err < 0)
                 goto out_err;
         err = pgio.pg_error;
-        if (err < 0)
+        if (nfs_error_is_fatal(err))
                 goto out_err;
         return 0;
 out_err: