Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

NFS: Convert cache_change_attribute into a jiffy-based value

Browse source 
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2005-10-27 22:12:38 -04:00
parent 0e574af1be
commit 913a70fc17
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/nfs/inode.c
View file

@ -1135,7 +1135,7 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
* We may need to keep the attributes marked as invalid if * We may need to keep the attributes marked as invalid if
* we raced with nfs_end_attr_update(). * 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); nfsi->cache_validity &= ~(NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ATIME);
spin_unlock(&inode->i_lock); spin_unlock(&inode->i_lock);
@ -1202,7 +1202,7 @@ void nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping)
if (S_ISDIR(inode->i_mode)) { if (S_ISDIR(inode->i_mode)) {
memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf)); memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));
/* This ensures we revalidate child dentries */ /* This ensures we revalidate child dentries */
nfsi->cache_change_attribute++; nfsi->cache_change_attribute = jiffies;
} }
spin_unlock(&inode->i_lock); spin_unlock(&inode->i_lock);
@ -1242,7 +1242,7 @@ void nfs_end_data_update(struct inode *inode)
nfsi->cache_validity |= NFS_INO_INVALID_DATA; nfsi->cache_validity |= NFS_INO_INVALID_DATA;
spin_unlock(&inode->i_lock); spin_unlock(&inode->i_lock);
} }
nfsi->cache_change_attribute ++; nfsi->cache_change_attribute = jiffies;
atomic_dec(&nfsi->data_updates); atomic_dec(&nfsi->data_updates);
} }
@ -1391,7 +1391,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr, unsign
/* Do we perhaps have any outstanding writes? */ /* Do we perhaps have any outstanding writes? */
if (nfsi->npages == 0) { if (nfsi->npages == 0) {
/* No, but did we race with nfs_end_data_update()? */ /* 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; inode->i_size = new_isize;
invalid |= NFS_INO_INVALID_DATA; invalid |= NFS_INO_INVALID_DATA;
} }

2
include/linux/nfs_fs.h
View file

@ -280,7 +280,7 @@ static inline long nfs_save_change_attribute(struct inode *inode)
static inline int nfs_verify_change_attribute(struct inode *inode, unsigned long chattr) static inline int nfs_verify_change_attribute(struct inode *inode, unsigned long chattr)
{ {
return !nfs_caches_unstable(inode) return !nfs_caches_unstable(inode)
&& chattr == NFS_I(inode)->cache_change_attribute; && time_after_eq(chattr, NFS_I(inode)->cache_change_attribute);
} }
/* /*