diff options
author | Trond Myklebust <trond.myklebust@fys.uio.no> | 2005-10-17 06:02:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-17 14:47:16 -0700 |
commit | b3c52da33ce95747b1bff86cce716d4f1397f14a (patch) | |
tree | 7958a929e5b9486bf0b5358776078c1bc71faf88 /fs/nfs/file.c | |
parent | 13b58ee51802a45d2b8853ffe0003d9fa768195c (diff) | |
download | linux-b3c52da33ce95747b1bff86cce716d4f1397f14a.tar.gz linux-b3c52da33ce95747b1bff86cce716d4f1397f14a.tar.bz2 linux-b3c52da33ce95747b1bff86cce716d4f1397f14a.zip |
[PATCH] NFS: Fix cache consistency races
If the data cache has been marked as potentially invalid by nfs_refresh_inode,
we should invalidate it rather than assume that changes are due to our own
activity.
Also ensure that we always start with a valid cache before declaring it
to be protected by a delegation.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/nfs/file.c')
-rw-r--r-- | fs/nfs/file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index f6b9eda925c5..6bdcfa95de94 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -137,7 +137,8 @@ static int nfs_revalidate_file(struct inode *inode, struct file *filp) struct nfs_inode *nfsi = NFS_I(inode); int retval = 0; - if ((nfsi->cache_validity & NFS_INO_REVAL_PAGECACHE) || nfs_attribute_timeout(inode)) + if ((nfsi->cache_validity & (NFS_INO_REVAL_PAGECACHE|NFS_INO_INVALID_ATTR)) + || nfs_attribute_timeout(inode)) retval = __nfs_revalidate_inode(NFS_SERVER(inode), inode); nfs_revalidate_mapping(inode, filp->f_mapping); return 0; |