summaryrefslogtreecommitdiffstats
path: root/fs/nfs/file.c
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-10-19 12:13:58 +0100
committerAnton Altaparmakov <aia21@cantab.net>2005-10-19 12:13:58 +0100
commite087a412b45543a87497f0a213dbd5d55099f267 (patch)
tree8892cc84dbee2b4387c9f2604a7892b6ef3aab25 /fs/nfs/file.c
parent7946ada30bc45546cefc85809ba0fd07879eff52 (diff)
parentbb7e257ef8d8ba43cab356aa1cc1b20d0106d45f (diff)
downloadop-kernel-dev-e087a412b45543a87497f0a213dbd5d55099f267.zip
op-kernel-dev-e087a412b45543a87497f0a213dbd5d55099f267.tar.gz
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'fs/nfs/file.c')
-rw-r--r--fs/nfs/file.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index f6b9eda..6bdcfa9 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;
OpenPOWER on IntegriCloud