diff --git a/[refs] b/[refs] index 7aa6dfc224c5..e52dfe21210e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d3e91a89b7adbc2831334def9e494dd9892f9af +refs/heads/master: 81d9bce5309288086b58b4d97a644e495fef75f2 diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c index f710e39f6ba2..eecd8b879afe 100644 --- a/trunk/fs/nfs/write.c +++ b/trunk/fs/nfs/write.c @@ -884,7 +884,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;