diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-09-29 17:15:01 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-10-09 17:19:20 -0400 |
commit | 4b841736bc16b320bcdb1e8ece585b3ced9a8811 (patch) | |
tree | c79e4c99393b8ebfd54617f0ffa791dacc443cb5 /include | |
parent | 8edb01828837302055a8f0afddb2256659480bc5 (diff) |
NFS: Fix nfs_verify_change_attribute()
We don't care about whether or not some other process on our client is
changing the directory while we're in nfs_lookup_revalidate(), because the
dcache will take care of ensuring local atomicity.
We can therefore remove the test for nfs_caches_unstable().
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/nfs_fs.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index a765dd456922..0197b1243fe0 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h | |||
@@ -270,16 +270,16 @@ static inline unsigned long nfs_save_change_attribute(struct inode *dir) | |||
270 | } | 270 | } |
271 | 271 | ||
272 | /** | 272 | /** |
273 | * nfs_verify_change_attribute - Detects NFS inode cache updates | 273 | * nfs_verify_change_attribute - Detects NFS remote directory changes |
274 | * @inode - pointer to inode | 274 | * @dir - pointer to parent directory inode |
275 | * @chattr - previously saved change attribute | 275 | * @chattr - previously saved change attribute |
276 | * Return "false" if metadata has been updated (or is in the process of | 276 | * Return "false" if the verifiers doesn't match the change attribute. |
277 | * being updated) since the change attribute was saved. | 277 | * This would usually indicate that the directory contents have changed on |
278 | * the server, and that any dentries need revalidating. | ||
278 | */ | 279 | */ |
279 | static inline int nfs_verify_change_attribute(struct inode *inode, unsigned long chattr) | 280 | static inline int nfs_verify_change_attribute(struct inode *dir, unsigned long chattr) |
280 | { | 281 | { |
281 | return !nfs_caches_unstable(inode) | 282 | return chattr == NFS_I(dir)->cache_change_attribute; |
282 | && chattr == NFS_I(inode)->cache_change_attribute; | ||
283 | } | 283 | } |
284 | 284 | ||
285 | /* | 285 | /* |