aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2007-05-09 09:00:17 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-05-09 17:57:58 -0400
commite62c2bba1fb7cf068eb78d731da46e4447a9efb1 (patch)
treebce53fe724400f7cfa1ae4621aafc6aa70bd564d /fs/nfs
parent38cb162b7585d837083b8365da1eb32687c5164c (diff)
NFS: Fix a jiffie wraparound issue
dentry verifiers are always set to the parent directory's cache_change_attribute. There is no reason to be testing for anything other than equality when we're trying to find out if the dentry has been checked since the last time the directory was modified. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/dir.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 625d8e5fb39d..fced7d1d48de 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -650,12 +650,17 @@ int nfs_fsync_dir(struct file *filp, struct dentry *dentry, int datasync)
650 */ 650 */
651static int nfs_check_verifier(struct inode *dir, struct dentry *dentry) 651static int nfs_check_verifier(struct inode *dir, struct dentry *dentry)
652{ 652{
653 unsigned long verf;
654
653 if (IS_ROOT(dentry)) 655 if (IS_ROOT(dentry))
654 return 1; 656 return 1;
657 verf = (unsigned long)dentry->d_fsdata;
655 if ((NFS_I(dir)->cache_validity & NFS_INO_INVALID_ATTR) != 0 658 if ((NFS_I(dir)->cache_validity & NFS_INO_INVALID_ATTR) != 0
656 || nfs_attribute_timeout(dir)) 659 || nfs_attribute_timeout(dir)
660 || nfs_caches_unstable(dir)
661 || verf != NFS_I(dir)->cache_change_attribute)
657 return 0; 662 return 0;
658 return nfs_verify_change_attribute(dir, (unsigned long)dentry->d_fsdata); 663 return 1;
659} 664}
660 665
661static inline void nfs_set_verifier(struct dentry * dentry, unsigned long verf) 666static inline void nfs_set_verifier(struct dentry * dentry, unsigned long verf)
@@ -665,8 +670,7 @@ static inline void nfs_set_verifier(struct dentry * dentry, unsigned long verf)
665 670
666static void nfs_refresh_verifier(struct dentry * dentry, unsigned long verf) 671static void nfs_refresh_verifier(struct dentry * dentry, unsigned long verf)
667{ 672{
668 if (time_after(verf, (unsigned long)dentry->d_fsdata)) 673 nfs_set_verifier(dentry, verf);
669 nfs_set_verifier(dentry, verf);
670} 674}
671 675
672/* 676/*