NFSv4: Fix up delegated attributes in nfs_setattr

nfs_setattr calls nfs_update_inode() directly, so we have to reset the
m/ctime there.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Lance Shelton <lance.shelton@hammerspace.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 6185e6e158201b6aa606e1b3d7b075d8c28e524c..b4914a11c3c25a325fc37bda8dadf51b92d7c1b6 100644 (file)
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -606,6 +606,28 @@ out_no_inode:
 }
 EXPORT_SYMBOL_GPL(nfs_fhget);
 
+static void
+nfs_fattr_fixup_delegated(struct inode *inode, struct nfs_fattr *fattr)
+{
+       unsigned long cache_validity = NFS_I(inode)->cache_validity;
+
+       if (nfs_have_delegated_mtime(inode)) {
+               if (!(cache_validity & NFS_INO_INVALID_CTIME))
+                       fattr->valid &= ~(NFS_ATTR_FATTR_PRECTIME |
+                                         NFS_ATTR_FATTR_CTIME);
+
+               if (!(cache_validity & NFS_INO_INVALID_MTIME))
+                       fattr->valid &= ~(NFS_ATTR_FATTR_PREMTIME |
+                                         NFS_ATTR_FATTR_MTIME);
+
+               if (!(cache_validity & NFS_INO_INVALID_ATIME))
+                       fattr->valid &= ~NFS_ATTR_FATTR_ATIME;
+       } else if (nfs_have_delegated_atime(inode)) {
+               if (!(cache_validity & NFS_INO_INVALID_ATIME))
+                       fattr->valid &= ~NFS_ATTR_FATTR_ATIME;
+       }
+}
+
 void nfs_update_delegated_atime(struct inode *inode)
 {
        spin_lock(&inode->i_lock);
@@ -2164,6 +2186,9 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
         */
        nfsi->read_cache_jiffies = fattr->time_start;
 
+       /* Fix up any delegated attributes in the struct nfs_fattr */
+       nfs_fattr_fixup_delegated(inode, fattr);
+
        save_cache_validity = nfsi->cache_validity;
        nfsi->cache_validity &= ~(NFS_INO_INVALID_ATTR
                        | NFS_INO_INVALID_ATIME