2 files changed, 1 insertions, 5 deletions

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 0d98074d0766..ed035a81eea2 100644
--- a/fs/nfs/inode.c
+++ b/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/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 5b42fef0baf0..f45161363be2 100644
--- a/include/linux/nfs_fs.h
+++ b/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;
 }
 
 /*