NFS: Don't force a dcache revalidation if nfs_wcc_update_inode succeeds

The reason is that if the weak cache consistency update was successful,
then we know that our client must be the only one that changed the
directory, and we've already updated the dcache to reflect the change.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 0e366a31f63b..871c102d9bdf 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -208,9 +208,12 @@ static void update_changeattr(struct inode *dir, struct nfs4_change_info *cinfo)
         struct nfs_inode *nfsi = NFS_I(dir);
 
         spin_lock(&dir->i_lock);
-        nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE|NFS_INO_INVALID_DATA;
-        if (cinfo->before == nfsi->change_attr && cinfo->atomic)
+        if (cinfo->after != nfsi->change_attr) {
+                nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE|NFS_INO_INVALID_DATA;
+                if (!cinfo->atomic || cinfo->before != nfsi->change_attr)
+                        nfsi->cache_change_attribute = jiffies;
                 nfsi->change_attr = cinfo->after;
+        }
         spin_unlock(&dir->i_lock);
 }