From 413e83cda1b4893bac4d579abae6145774c55fda Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Sun, 29 Apr 2012 12:50:01 -0400 Subject: [PATCH] --- yaml --- r: 308577 b: refs/heads/master c: 8d197a568fc337c66729b289c7fa0f28c14ba5ac h: refs/heads/master i: 308575: 153edc0e4bb1b081def2aa62d824c591adc990cf v: v3 --- [refs] | 2 +- trunk/fs/nfs/write.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 562ca90f3081..546ebfdc72d3 100644 --- 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 index d1e4f81ba057..6f263daac748 100644 --- 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; } /*