Skip to content

Commit

Permalink
NFS: Always trust the PageUptodate flag when we have a delegation
Browse files Browse the repository at this point in the history
We can always use the optimal full page write if we know that we
hold a delegation.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed May 1, 2012
1 parent 01da47b commit 8d197a5
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions fs/nfs/write.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/*
Expand Down

0 comments on commit 8d197a5

Please sign in to comment.