NFS: Always trust the PageUptodate flag when we have a delegation

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>
This commit is contained in:
Trond Myklebust 2012-04-29 12:50:01 -04:00
parent 01da47bde7
commit 8d197a568f

View File

@ -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;
}
/*