---

yaml --- r: 308577 b: refs/heads/master c: 8d197a5 h: refs/heads/master i: 308575: 153edc0 v: v3
git-mirror · May 1, 2012 · 413e83c · 413e83c
1 parent a28ed8f
commit 413e83c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01da47bde78ff2149f6546a0f17e25983aaddd7b
+refs/heads/master: 8d197a568fc337c66729b289c7fa0f28c14ba5ac
diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c
@@ -850,10 +850,14 @@ int nfs_flush_incompatible(struct file *file, struct page *page)
  * the PageUptodate() flag. In this case, we will need to turn off
  * write optimisations that depend on the page contents being correct.
  */
-static int nfs_write_pageuptodate(struct page *page, struct inode *inode)
+static bool nfs_write_pageuptodate(struct page *page, struct inode *inode)
 {
-	return PageUptodate(page) &&
-		!(NFS_I(inode)->cache_validity & (NFS_INO_REVAL_PAGECACHE|NFS_INO_INVALID_DATA));
+	if (nfs_have_delegated_attributes(inode))
+		goto out;
+	if (NFS_I(inode)->cache_validity & NFS_INO_REVAL_PAGECACHE)
+		return false;
+out:
+	return PageUptodate(page) != 0;
 }
 
 /*