From 57483171dd448796491ded55ec8259fe1572292f Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Wed, 10 Mar 2010 15:21:44 -0500
Subject: [PATCH] --- yaml --- r: 188205 b: refs/heads/master c:
 b4d2314bb88b07e5a04e6c75b442a1dfcd60e340 h: refs/heads/master i:   188203:
 87cdbe673953a24f3fe5d9ffd1cb6fded06a67f5 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/nfs/delegation.h | 6 ++++++
 trunk/fs/nfs/dir.c        | 2 +-
 trunk/fs/nfs/inode.c      | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d38e4d7fd81c..50b231a8b6cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49697ee79242d5f8ac88f1ebc62e583d16bcc687
+refs/heads/master: b4d2314bb88b07e5a04e6c75b442a1dfcd60e340
diff --git a/trunk/fs/nfs/delegation.h b/trunk/fs/nfs/delegation.h
index 944b627ec6e1..69e7b8140122 100644
--- a/trunk/fs/nfs/delegation.h
+++ b/trunk/fs/nfs/delegation.h
@@ -71,4 +71,10 @@ static inline int nfs_inode_return_delegation(struct inode *inode)
 }
 #endif
 
+static inline int nfs_have_delegated_attributes(struct inode *inode)
+{
+	return nfs_have_delegation(inode, FMODE_READ) &&
+		!(NFS_I(inode)->cache_validity & NFS_INO_REVAL_FORCED);
+}
+
 #endif
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index a1f6b4438fb1..c6f2750648f4 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -1789,7 +1789,7 @@ static int nfs_access_get_cached(struct inode *inode, struct rpc_cred *cred, str
 	cache = nfs_access_search_rbtree(inode, cred);
 	if (cache == NULL)
 		goto out;
-	if (!nfs_have_delegation(inode, FMODE_READ) &&
+	if (!nfs_have_delegated_attributes(inode) &&
 	    !time_in_range_open(jiffies, cache->jiffies, cache->jiffies + nfsi->attrtimeo))
 		goto out_stale;
 	res->jiffies = cache->jiffies;
diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c
index 657201acda84..e358df75a6ad 100644
--- a/trunk/fs/nfs/inode.c
+++ b/trunk/fs/nfs/inode.c
@@ -729,7 +729,7 @@ int nfs_attribute_timeout(struct inode *inode)
 {
 	struct nfs_inode *nfsi = NFS_I(inode);
 
-	if (nfs_have_delegation(inode, FMODE_READ))
+	if (nfs_have_delegated_attributes(inode))
 		return 0;
 	return !time_in_range_open(jiffies, nfsi->read_cache_jiffies, nfsi->read_cache_jiffies + nfsi->attrtimeo);
 }