NFS: Don't clear PG_writeback until after we've processed unstable writes

Ensure that we don't release the PG_writeback lock until after the page has
either been redirtied, or queued on the nfs_inode 'commit' list.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 3ed4feb8c85..8e9424651bc 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -920,8 +920,8 @@ out_bad:
                 list_del(&data->pages);
                 nfs_writedata_release(data);
         }
-        nfs_end_page_writeback(req->wb_page);
         nfs_redirty_request(req);
+        nfs_end_page_writeback(req->wb_page);
         nfs_clear_page_writeback(req);
         return -ENOMEM;
 }
@@ -966,8 +966,8 @@ static int nfs_flush_one(struct inode *inode, struct list_head *head, int how)
         while (!list_empty(head)) {
                 struct nfs_page *req = nfs_list_entry(head->next);
                 nfs_list_remove_request(req);
-                nfs_end_page_writeback(req->wb_page);
                 nfs_redirty_request(req);
+                nfs_end_page_writeback(req->wb_page);
                 nfs_clear_page_writeback(req);
         }
         return -ENOMEM;
@@ -1002,8 +1002,8 @@ out_err:
         while (!list_empty(head)) {
                 req = nfs_list_entry(head->next);
                 nfs_list_remove_request(req);
-                nfs_end_page_writeback(req->wb_page);
                 nfs_redirty_request(req);
+                nfs_end_page_writeback(req->wb_page);
                 nfs_clear_page_writeback(req);
         }
         return error;