diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-09-28 22:20:12 +0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-10-10 01:18:46 +0400 |
| commit | 7957c1418f4b6c66e28d4ac3c4d7a8c19d526c48 (patch) | |
| tree | 5769b3af76c91866a4ccaa607635c86755239a51 | |
| parent | 68e8a70d3cae23716f6b2b3872eba10eccea148c (diff) | |
| download | linux-7957c1418f4b6c66e28d4ac3c4d7a8c19d526c48.tar.xz | |
NFS: fix nfs_verify_change_attribute
We always want to check that the verifier and directory
cache_change_attribute match. This also allows us to remove the 'wraparound
hack' for the cache_change_attribute. If we're only checking for equality,
then we don't care about wraparound issues.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
| -rw-r--r-- | fs/nfs/inode.c | 4 | ||||
| -rw-r--r-- | include/linux/nfs_fs.h | 2 |
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; } /* |