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/inode.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/inode.c')
-rw-r--r-- | fs/nfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 657201acda84..e358df75a6ad 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
@@ -729,7 +729,7 @@ int nfs_attribute_timeout(struct inode *inode) | |||
729 | { | 729 | { |
730 | struct nfs_inode *nfsi = NFS_I(inode); | 730 | struct nfs_inode *nfsi = NFS_I(inode); |
731 | 731 | ||
732 | if (nfs_have_delegation(inode, FMODE_READ)) | 732 | if (nfs_have_delegated_attributes(inode)) |
733 | return 0; | 733 | return 0; |
734 | return !time_in_range_open(jiffies, nfsi->read_cache_jiffies, nfsi->read_cache_jiffies + nfsi->attrtimeo); | 734 | return !time_in_range_open(jiffies, nfsi->read_cache_jiffies, nfsi->read_cache_jiffies + nfsi->attrtimeo); |
735 | } | 735 | } |