xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfixes' into nfs-for-next

Browse Source
This commit is contained in:
Trond Myklebust
2012-12-11 09:16:26 -05:00
parent 1fa8064429 81d9bce530
commit 7ce0171d4f
27 changed files with 124 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfs/write.c
View File

@@ -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;