aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2007-09-30 15:31:19 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-10-09 17:19:32 -0400
commit2f78e4313afd34a4ded591ec5687843113fbaa01 (patch)
tree6c5364d61ab96979312b506167beca17fcdbc533
parent446e534985bada0ad7451c08cf213c06695f9b67 (diff)
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>
-rw-r--r--fs/nfs/inode.c5
1 files changed, 1 insertions, 4 deletions
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
686 } 686 }
687 spin_lock(&inode->i_lock); 687 spin_lock(&inode->i_lock);
688 nfsi->cache_validity &= ~NFS_INO_INVALID_DATA; 688 nfsi->cache_validity &= ~NFS_INO_INVALID_DATA;
689 if (S_ISDIR(inode->i_mode)) { 689 if (S_ISDIR(inode->i_mode))
690 memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf)); 690 memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));
691 /* This ensures we revalidate child dentries */
692 nfsi->cache_change_attribute = jiffies;
693 }
694 spin_unlock(&inode->i_lock); 691 spin_unlock(&inode->i_lock);
695 nfs_inc_stats(inode, NFSIOS_DATAINVALIDATE); 692 nfs_inc_stats(inode, NFSIOS_DATAINVALIDATE);
696 dfprintk(PAGECACHE, "NFS: (%s/%Ld) data cache invalidated\n", 693 dfprintk(PAGECACHE, "NFS: (%s/%Ld) data cache invalidated\n",