---

yaml --- r: 69269 b: refs/heads/master c: 2f78e43 h: refs/heads/master i: 69267: 83282d6 v: v3
git-mirror · Oct 9, 2007 · 9d9efb7 · 9d9efb7
1 parent 75db681
commit 9d9efb7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 446e534985bada0ad7451c08cf213c06695f9b67
+refs/heads/master: 2f78e4313afd34a4ded591ec5687843113fbaa01
diff --git a/trunk/fs/nfs/inode.c b/trunk/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",