diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-27 22:12:38 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-27 22:12:38 -0400 |
commit | 913a70fc170530f7e1ff0693595155457cc6d0ca (patch) | |
tree | 1f3d5db26462d02ecca383794b3061a5eae8d9cc /fs/nfs | |
parent | 0e574af1be5f569a5d7f2800333b0bfb358a5e34 (diff) |
NFS: Convert cache_change_attribute into a jiffy-based value
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/inode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 65d5ab45ddc5..449df8c8aa31 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
@@ -1135,7 +1135,7 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) | |||
1135 | * We may need to keep the attributes marked as invalid if | 1135 | * We may need to keep the attributes marked as invalid if |
1136 | * we raced with nfs_end_attr_update(). | 1136 | * we raced with nfs_end_attr_update(). |
1137 | */ | 1137 | */ |
1138 | if (verifier == nfsi->cache_change_attribute) | 1138 | if (time_after_eq(verifier, nfsi->cache_change_attribute)) |
1139 | nfsi->cache_validity &= ~(NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ATIME); | 1139 | nfsi->cache_validity &= ~(NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ATIME); |
1140 | spin_unlock(&inode->i_lock); | 1140 | spin_unlock(&inode->i_lock); |
1141 | 1141 | ||
@@ -1202,7 +1202,7 @@ void nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping) | |||
1202 | if (S_ISDIR(inode->i_mode)) { | 1202 | if (S_ISDIR(inode->i_mode)) { |
1203 | memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf)); | 1203 | memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf)); |
1204 | /* This ensures we revalidate child dentries */ | 1204 | /* This ensures we revalidate child dentries */ |
1205 | nfsi->cache_change_attribute++; | 1205 | nfsi->cache_change_attribute = jiffies; |
1206 | } | 1206 | } |
1207 | spin_unlock(&inode->i_lock); | 1207 | spin_unlock(&inode->i_lock); |
1208 | 1208 | ||
@@ -1242,7 +1242,7 @@ void nfs_end_data_update(struct inode *inode) | |||
1242 | nfsi->cache_validity |= NFS_INO_INVALID_DATA; | 1242 | nfsi->cache_validity |= NFS_INO_INVALID_DATA; |
1243 | spin_unlock(&inode->i_lock); | 1243 | spin_unlock(&inode->i_lock); |
1244 | } | 1244 | } |
1245 | nfsi->cache_change_attribute ++; | 1245 | nfsi->cache_change_attribute = jiffies; |
1246 | atomic_dec(&nfsi->data_updates); | 1246 | atomic_dec(&nfsi->data_updates); |
1247 | } | 1247 | } |
1248 | 1248 | ||
@@ -1391,7 +1391,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr, unsign | |||
1391 | /* Do we perhaps have any outstanding writes? */ | 1391 | /* Do we perhaps have any outstanding writes? */ |
1392 | if (nfsi->npages == 0) { | 1392 | if (nfsi->npages == 0) { |
1393 | /* No, but did we race with nfs_end_data_update()? */ | 1393 | /* No, but did we race with nfs_end_data_update()? */ |
1394 | if (verifier == nfsi->cache_change_attribute) { | 1394 | if (time_after_eq(verifier, nfsi->cache_change_attribute)) { |
1395 | inode->i_size = new_isize; | 1395 | inode->i_size = new_isize; |
1396 | invalid |= NFS_INO_INVALID_DATA; | 1396 | invalid |= NFS_INO_INVALID_DATA; |
1397 | } | 1397 | } |