NFS: Convert cache_change_attribute into a jiffy-based value Adapted from mainline: commit 913a70fc170530f7e1ff0693595155457cc6d0ca Author: Trond Myklebust Date: Thu Oct 27 22:12:38 2005 -0400 NFS: Convert cache_change_attribute into a jiffy-based value Signed-off-by: Trond Myklebust Signed-off-by: Chuck Lever --- fs/nfs/inode.c | 10 +++++----- include/linux/nfs_fs.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 26e53a6..410e6f6 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -1056,7 +1056,7 @@ __nfs_revalidate_inode(struct nfs_server * We may need to keep the attributes marked as invalid if * we raced with nfs_end_attr_update(). */ - if (verifier == nfsi->cache_change_attribute) + if (time_after_eq(verifier, nfsi->cache_change_attribute)) nfsi->cache_validity &= ~(NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ATIME); spin_unlock(&inode->i_lock); @@ -1124,7 +1124,7 @@ void nfs_revalidate_mapping(struct inode if (S_ISDIR(inode->i_mode)) { memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf)); /* This ensures we revalidate child dentries */ - nfsi->cache_change_attribute++; + nfsi->cache_change_attribute = jiffies; } spin_unlock(&inode->i_lock); @@ -1164,7 +1164,7 @@ void nfs_end_data_update(struct inode *i nfsi->cache_validity |= NFS_INO_INVALID_DATA; spin_unlock(&inode->i_lock); } - nfsi->cache_change_attribute ++; + nfsi->cache_change_attribute = jiffies; atomic_dec(&nfsi->data_updates); } @@ -1185,7 +1185,7 @@ void nfs_end_data_update_defer(struct in /* Directories and symlinks: invalidate page cache too */ if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode)) nfsi->cache_validity |= NFS_INO_INVALID_DATA; - nfsi->cache_change_attribute ++; + nfsi->cache_change_attribute = jiffies; } } @@ -1356,7 +1356,7 @@ static int nfs_update_inode(struct inode /* Do we perhaps have any outstanding writes? */ if (nfsi->npages == 0) { /* No, but did we race with nfs_end_data_update()? */ - if (verifier == nfsi->cache_change_attribute) { + if (time_after_eq(verifier, nfsi->cache_change_attribute)) { inode->i_size = new_isize; invalid |= NFS_INO_INVALID_DATA; } diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index 57aa6bd..737d60a 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h @@ -301,7 +301,7 @@ static inline long nfs_save_change_attri static inline int nfs_verify_change_attribute(struct inode *inode, unsigned long chattr) { return !nfs_caches_unstable(inode) - && chattr == NFS_I(inode)->cache_change_attribute; + && time_after_eq(chattr, NFS_I(inode)->cache_change_attribute); } /*