From cfcfeab3df328ebe230f0bbba1afce4dcf35b7a7 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 23 Dec 2008 15:21:55 -0500
Subject: [PATCH] --- yaml --- r: 124742 b: refs/heads/master c:
 7a50c60e461f6ff97428da9448c3dad5b7bef491 h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/fs/nfs/dir.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 67d6da2bebf6..4c4848cd2a19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15860ab1d7700249ebe3b0b8ca86ce43dfd0d66f
+refs/heads/master: 7a50c60e461f6ff97428da9448c3dad5b7bef491
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
index ff167aa62434..ed7024c34885 100644
--- a/trunk/fs/nfs/dir.c
+++ b/trunk/fs/nfs/dir.c
@@ -1797,7 +1797,8 @@ 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 (!time_in_range(jiffies, cache->jiffies, cache->jiffies + nfsi->attrtimeo))
+	if (!nfs_have_delegation(inode, FMODE_READ) &&
+	    !time_in_range(jiffies, cache->jiffies, cache->jiffies + nfsi->attrtimeo))
 		goto out_stale;
 	res->jiffies = cache->jiffies;
 	res->cred = cache->cred;