From: Trond Myklebust Date: Thu, 20 Aug 2015 23:56:07 +0000 (-0500) Subject: NFSv4: Force a post-op attribute update when holding a delegation X-Git-Tag: v4.1.9~98 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=66bfdda4b2042bca88b429a55ca010d5ab94f991;p=users%2Fjedix%2Flinux-maple.git NFSv4: Force a post-op attribute update when holding a delegation commit aaae3f00d3f67f681a1f3cb7af999e976e8a24ce upstream. If the ctime or mtime or change attribute have changed because of an operation we initiated, we should make sure that we force an attribute update. However we do not want to mark the page cache for revalidation. Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman --- diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index f1478544aa0c..976ba792fbc6 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -1480,6 +1480,13 @@ static int nfs_post_op_update_inode_locked(struct inode *inode, struct nfs_fattr { unsigned long invalid = NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE; + /* + * Don't revalidate the pagecache if we hold a delegation, but do + * force an attribute update + */ + if (NFS_PROTO(inode)->have_delegation(inode, FMODE_READ)) + invalid = NFS_INO_INVALID_ATTR|NFS_INO_REVAL_FORCED; + if (S_ISDIR(inode->i_mode)) invalid |= NFS_INO_INVALID_DATA; nfs_set_cache_invalid(inode, invalid);