Merge branch 'bugfixes' into nfs-for-next

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index f5bc8e11713b..f608ca606b2b 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -879,7 +879,7 @@ static bool nfs_write_pageuptodate(struct page *page, struct inode *inode)
 {
         if (nfs_have_delegated_attributes(inode))
                 goto out;
-        if (NFS_I(inode)->cache_validity & NFS_INO_REVAL_PAGECACHE)
+        if (NFS_I(inode)->cache_validity & (NFS_INO_INVALID_DATA|NFS_INO_REVAL_PAGECACHE))
                 return false;
 out:
         return PageUptodate(page) != 0;
@@ -1823,7 +1823,7 @@ int __init nfs_init_writepagecache(void)
                 goto out_destroy_write_mempool;
 
         nfs_commit_mempool = mempool_create_slab_pool(MIN_POOL_COMMIT,
-                                                      nfs_wdata_cachep);
+                                                      nfs_cdata_cachep);
         if (nfs_commit_mempool == NULL)
                 goto out_destroy_commit_cache;