diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-03-10 21:21:44 +0100 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-03-10 21:21:44 +0100 |
| commit | b4d2314bb88b07e5a04e6c75b442a1dfcd60e340 (patch) | |
| tree | 9727944bf30a47cf02f9b9547adcaeafeee25843 /fs/nfs/dir.c | |
| parent | nfs4: Make the v4 callback service hidden (diff) | |
| download | linux-b4d2314bb88b07e5a04e6c75b442a1dfcd60e340.tar.xz linux-b4d2314bb88b07e5a04e6c75b442a1dfcd60e340.zip | |
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 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; |