From 67ad148c6ad930f2842f14e266de215bb8b70db2 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sat, 29 Sep 2007 17:25:43 -0400
Subject: [PATCH] --- yaml --- r: 69275 b: refs/heads/master c:
 a1643a92f6de92074116922a2d2906dd33499ff4 h: refs/heads/master i:   69273:
 8897374efa4cb05961ac2576bfcfd70757dff7d1   69271:
 2e965ea98a8cf5fd30d22852be7328fce578ced5 v: v3

---
 [refs]                       | 2 +-
 trunk/fs/nfs/dir.c           | 2 +-
 trunk/include/linux/nfs_fs.h | 6 ------
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index ec205c66254d..3dec6ff5bc21 100644
--- 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
index 35b447d79dbe..a03ed2f85047 100644
--- 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
index 35d61924e0b9..c947803a7ba4 100644
--- 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;