From 8a074edb69f38e99633001aa28d7bc07ad611912 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Mon, 10 Dec 2012 09:25:48 -0500
Subject: [PATCH] --- yaml --- r: 346619 b: refs/heads/master c:
 81d9bce5309288086b58b4d97a644e495fef75f2 h: refs/heads/master i:   346617:
 2850d5022cb5501a13708a2a675d48ccfe527c8a   346615:
 472f515ded219ccab8a39cc54df78d798981756a v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/write.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;