From ac2dce3cb2988a70d0b6fa2ce7ab13cd4d328199 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Fri, 28 Sep 2007 19:11:33 -0400
Subject: [PATCH] --- yaml --- r: 69260 b: refs/heads/master c:
 7fdc49c4e49ba926348f71844cda7f5e12709738 h: refs/heads/master v: v3

---
 [refs]               |  2 +-
 trunk/fs/nfs/inode.c | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 049acff62d53..85fa7ddd2186 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8850df999cd16aa141098e2e8be04a590276f3cc
+refs/heads/master: 7fdc49c4e49ba926348f71844cda7f5e12709738
diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c
index e37faa3a7bac..185cfd09d7f7 100644
--- a/trunk/fs/nfs/inode.c
+++ b/trunk/fs/nfs/inode.c
@@ -607,16 +607,10 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
 	status = nfs_wait_on_inode(inode);
 	if (status < 0)
 		goto out;
-	if (NFS_STALE(inode)) {
-		status = -ESTALE;
-		/* Do we trust the cached ESTALE? */
-		if (NFS_ATTRTIMEO(inode) != 0) {
-			if (nfsi->cache_validity & (NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ATIME)) {
-				/* no */
-			} else
-				goto out;
-		}
-	}
+
+	status = -ESTALE;
+	if (NFS_STALE(inode))
+		goto out;
 
 	status = NFS_PROTO(inode)->getattr(server, NFS_FH(inode), &fattr);
 	if (status != 0) {