From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sun, 30 Sep 2007 19:31:19 +0000 (-0400)
Subject: NFS: Don't set cache_change_attribute in nfs_revalidate_mapping
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=2f78e4313afd34a4ded591ec5687843113fbaa01;p=deliverable%2Flinux.git

NFS: Don't set cache_change_attribute in nfs_revalidate_mapping

The attribute revalidation code will already have taken care of resetting
nfsi->cache_change_attribute.

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

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index c5f4e0567533..8c53b7eff7ba 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -686,11 +686,8 @@ static int nfs_invalidate_mapping_nolock(struct inode *inode, struct address_spa
 	}
 	spin_lock(&inode->i_lock);
 	nfsi->cache_validity &= ~NFS_INO_INVALID_DATA;
-	if (S_ISDIR(inode->i_mode)) {
+	if (S_ISDIR(inode->i_mode))
 		memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));
-		/* This ensures we revalidate child dentries */
-		nfsi->cache_change_attribute = jiffies;
-	}
 	spin_unlock(&inode->i_lock);
 	nfs_inc_stats(inode, NFSIOS_DATAINVALIDATE);
 	dfprintk(PAGECACHE, "NFS: (%s/%Ld) data cache invalidated\n",