From 21b08d795e189e4156bd7c69eff3e941c87f949d Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Fri, 28 Sep 2007 14:20:12 -0400 Subject: [PATCH] --- yaml --- r: 69252 b: refs/heads/master c: 7957c1418f4b6c66e28d4ac3c4d7a8c19d526c48 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/inode.c | 4 ---- trunk/include/linux/nfs_fs.h | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 293970634d4d..1efae99f517b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68e8a70d3cae23716f6b2b3872eba10eccea148c +refs/heads/master: 7957c1418f4b6c66e28d4ac3c4d7a8c19d526c48 diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c index 0d98074d0766..ed035a81eea2 100644 --- a/trunk/fs/nfs/inode.c +++ b/trunk/fs/nfs/inode.c @@ -972,10 +972,6 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) nfsi->read_cache_jiffies = fattr->time_start; nfsi->last_updated = now; - /* Fix a wraparound issue with nfsi->cache_change_attribute */ - if (time_before(now, nfsi->cache_change_attribute)) - nfsi->cache_change_attribute = now - 600*HZ; - /* Are we racing with known updates of the metadata on the server? */ data_stable = nfs_verify_change_attribute(inode, fattr->time_start); nfsi->cache_validity &= ~(NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ATIME diff --git a/trunk/include/linux/nfs_fs.h b/trunk/include/linux/nfs_fs.h index 5b42fef0baf0..f45161363be2 100644 --- a/trunk/include/linux/nfs_fs.h +++ b/trunk/include/linux/nfs_fs.h @@ -277,7 +277,7 @@ static inline long nfs_save_change_attribute(struct inode *inode) static inline int nfs_verify_change_attribute(struct inode *inode, unsigned long chattr) { return !nfs_caches_unstable(inode) - && time_after_eq(chattr, NFS_I(inode)->cache_change_attribute); + && chattr == NFS_I(inode)->cache_change_attribute; } /*