diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-12-11 15:16:26 +0100 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-12-11 15:16:26 +0100 |
| commit | 7ce0171d4f78992184faed87ea897d730b972965 (patch) | |
| tree | 71dba7444672eb10244566e6f0ed7829f1e3abf5 /fs/nfs/write.c | |
| parent | NFSv4.1: Try to eliminate outliers when updating target_highest_slotid (diff) | |
| parent | nfs: don't extend writes to cover entire page if pagecache is invalid (diff) | |
| download | linux-7ce0171d4f78992184faed87ea897d730b972965.tar.xz linux-7ce0171d4f78992184faed87ea897d730b972965.zip | |
Merge branch 'bugfixes' into nfs-for-next
Diffstat (limited to 'fs/nfs/write.c')
| -rw-r--r-- | fs/nfs/write.c | 4 |
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; |