---

yaml --- r: 346619 b: refs/heads/master c: 81d9bce h: refs/heads/master i: 346617: 2850d50 346615: 472f515 v: v3
git-mirror · Dec 11, 2012 · 8a074ed · 8a074ed
1 parent 8d63b55
commit 8a074ed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;