---

yaml --- r: 69275 b: refs/heads/master c: a1643a9 h: refs/heads/master i: 69273: 8897374 69271: 2e965ea v: v3
git-mirror · Oct 9, 2007 · 67ad148 · 67ad148
1 parent 99d3833
commit 67ad148
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3258b4fa552c4f994b5e6490a8ad88f5d7e0e648
+refs/heads/master: a1643a92f6de92074116922a2d2906dd33499ff4
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
@@ -788,7 +788,7 @@ static int nfs_lookup_revalidate(struct dentry * dentry, struct nameidata *nd)
 out_zap_parent:
 	nfs_zap_caches(dir);
  out_bad:
-	NFS_CACHEINV(dir);
+	nfs_mark_for_revalidate(dir);
 	if (inode && S_ISDIR(inode->i_mode)) {
 		/* Purge readdir caches. */
 		nfs_zap_caches(inode);

diff --git a/trunk/include/linux/nfs_fs.h b/trunk/include/linux/nfs_fs.h
@@ -240,12 +240,6 @@ static inline void nfs_mark_for_revalidate(struct inode *inode)
 	spin_unlock(&inode->i_lock);
 }
 
-static inline void NFS_CACHEINV(struct inode *inode)
-{
-	if (!nfs_caches_unstable(inode))
-		nfs_mark_for_revalidate(inode);
-}
-
 static inline int nfs_server_capable(struct inode *inode, int cap)
 {
 	return NFS_SERVER(inode)->caps & cap;