diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-09-28 14:20:12 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-10-09 17:18:46 -0400 |
commit | 7957c1418f4b6c66e28d4ac3c4d7a8c19d526c48 (patch) | |
tree | 5769b3af76c91866a4ccaa607635c86755239a51 /fs/nfs/inode.c | |
parent | 68e8a70d3cae23716f6b2b3872eba10eccea148c (diff) |
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>
Diffstat (limited to 'fs/nfs/inode.c')
-rw-r--r-- | fs/nfs/inode.c | 4 |
1 files changed, 0 insertions, 4 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) | |||
972 | nfsi->read_cache_jiffies = fattr->time_start; | 972 | nfsi->read_cache_jiffies = fattr->time_start; |
973 | nfsi->last_updated = now; | 973 | nfsi->last_updated = now; |
974 | 974 | ||
975 | /* Fix a wraparound issue with nfsi->cache_change_attribute */ | ||
976 | if (time_before(now, nfsi->cache_change_attribute)) | ||
977 | nfsi->cache_change_attribute = now - 600*HZ; | ||
978 | |||
979 | /* Are we racing with known updates of the metadata on the server? */ | 975 | /* Are we racing with known updates of the metadata on the server? */ |
980 | data_stable = nfs_verify_change_attribute(inode, fattr->time_start); | 976 | data_stable = nfs_verify_change_attribute(inode, fattr->time_start); |
981 | nfsi->cache_validity &= ~(NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ATIME | 977 | nfsi->cache_validity &= ~(NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ATIME |