1 files changed, 35 insertions, 3 deletions

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index a87a44f84113..94e94bd11aae 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -451,11 +451,13 @@ static int nfs_write_end(struct file *file, struct address_space *mapping,
  * - Called if either PG_private or PG_fscache is set on the page
  * - Caller holds page lock
  */
-static void nfs_invalidate_page(struct page *page, unsigned long offset)
+static void nfs_invalidate_page(struct page *page, unsigned int offset,
+                                unsigned int length)
 {
-        dfprintk(PAGECACHE, "NFS: invalidate_page(%p, %lu)\n", page, offset);
+        dfprintk(PAGECACHE, "NFS: invalidate_page(%p, %u, %u)\n",
+                 page, offset, length);
 
-        if (offset != 0)
+        if (offset != 0 || length < PAGE_CACHE_SIZE)
                 return;
         /* Cancel any unstarted writes on this page */
         nfs_wb_page_cancel(page_file_mapping(page)->host, page);
@@ -493,6 +495,35 @@ static int nfs_release_page(struct page *page, gfp_t gfp)
         return nfs_fscache_release_page(page, gfp);
 }
 
+static void nfs_check_dirty_writeback(struct page *page,
+                                bool *dirty, bool *writeback)
+{
+        struct nfs_inode *nfsi;
+        struct address_space *mapping = page_file_mapping(page);
+
+        if (!mapping || PageSwapCache(page))
+                return;
+
+        /*
+         * Check if an unstable page is currently being committed and
+         * if so, have the VM treat it as if the page is under writeback
+         * so it will not block due to pages that will shortly be freeable.
+         */
+        nfsi = NFS_I(mapping->host);
+        if (test_bit(NFS_INO_COMMIT, &nfsi->flags)) {
+                *writeback = true;
+                return;
+        }
+
+        /*
+         * If PagePrivate() is set, then the page is not freeable and as the
+         * inode is not being committed, it's not going to be cleaned in the
+         * near future so treat it as dirty
+         */
+        if (PagePrivate(page))
+                *dirty = true;
+}
+
 /*
  * Attempt to clear the private state associated with a page when an error
  * occurs that requires the cached contents of an inode to be written back or
@@ -540,6 +571,7 @@ const struct address_space_operations nfs_file_aops = {
         .direct_IO = nfs_direct_IO,
         .migratepage = nfs_migrate_page,
         .launder_page = nfs_launder_page,
+        .is_dirty_writeback = nfs_check_dirty_writeback,
         .error_remove_page = generic_error_remove_page,
 #ifdef CONFIG_NFS_SWAP
         .swap_activate = nfs_swap_activate,