diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-03-10 15:21:44 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-03-10 15:21:44 -0500 |
commit | b4d2314bb88b07e5a04e6c75b442a1dfcd60e340 (patch) | |
tree | 9727944bf30a47cf02f9b9547adcaeafeee25843 /fs/nfs/dir.c | |
parent | 49697ee79242d5f8ac88f1ebc62e583d16bcc687 (diff) |
NFSv4: Don't ignore the NFS_INO_REVAL_FORCED flag in nfs_revalidate_inode()
If the NFS_INO_REVAL_FORCED flag is set, that means that we don't yet have
an up to date attribute cache. Even if we hold a delegation, we must
put a GETATTR on the wire.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: stable@kernel.org
Diffstat (limited to 'fs/nfs/dir.c')
-rw-r--r-- | fs/nfs/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index a1f6b4438fb1..c6f2750648f4 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
@@ -1789,7 +1789,7 @@ static int nfs_access_get_cached(struct inode *inode, struct rpc_cred *cred, str | |||
1789 | cache = nfs_access_search_rbtree(inode, cred); | 1789 | cache = nfs_access_search_rbtree(inode, cred); |
1790 | if (cache == NULL) | 1790 | if (cache == NULL) |
1791 | goto out; | 1791 | goto out; |
1792 | if (!nfs_have_delegation(inode, FMODE_READ) && | 1792 | if (!nfs_have_delegated_attributes(inode) && |
1793 | !time_in_range_open(jiffies, cache->jiffies, cache->jiffies + nfsi->attrtimeo)) | 1793 | !time_in_range_open(jiffies, cache->jiffies, cache->jiffies + nfsi->attrtimeo)) |
1794 | goto out_stale; | 1794 | goto out_stale; |
1795 | res->jiffies = cache->jiffies; | 1795 | res->jiffies = cache->jiffies; |