summaryrefslogtreecommitdiffstats
path: root/fs/nfs/inode.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfs/inode.c')
-rw-r--r--fs/nfs/inode.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index ceeaf0fb6657..7d893543cf3b 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -1314,7 +1314,7 @@ static unsigned long nfs_wcc_update_inode(struct inode *inode, struct nfs_fattr
1314 1314
1315 if ((fattr->valid & NFS_ATTR_FATTR_PRECHANGE) 1315 if ((fattr->valid & NFS_ATTR_FATTR_PRECHANGE)
1316 && (fattr->valid & NFS_ATTR_FATTR_CHANGE) 1316 && (fattr->valid & NFS_ATTR_FATTR_CHANGE)
1317 && !inode_cmp_iversion_raw(inode, fattr->pre_change_attr)) { 1317 && inode_eq_iversion_raw(inode, fattr->pre_change_attr)) {
1318 inode_set_iversion_raw(inode, fattr->change_attr); 1318 inode_set_iversion_raw(inode, fattr->change_attr);
1319 if (S_ISDIR(inode->i_mode)) 1319 if (S_ISDIR(inode->i_mode))
1320 nfs_set_cache_invalid(inode, NFS_INO_INVALID_DATA); 1320 nfs_set_cache_invalid(inode, NFS_INO_INVALID_DATA);
@@ -1373,7 +1373,7 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat
1373 1373
1374 if (!nfs_file_has_buffered_writers(nfsi)) { 1374 if (!nfs_file_has_buffered_writers(nfsi)) {
1375 /* Verify a few of the more important attributes */ 1375 /* Verify a few of the more important attributes */
1376 if ((fattr->valid & NFS_ATTR_FATTR_CHANGE) != 0 && inode_cmp_iversion_raw(inode, fattr->change_attr)) 1376 if ((fattr->valid & NFS_ATTR_FATTR_CHANGE) != 0 && !inode_eq_iversion_raw(inode, fattr->change_attr))
1377 invalid |= NFS_INO_INVALID_ATTR | NFS_INO_REVAL_PAGECACHE; 1377 invalid |= NFS_INO_INVALID_ATTR | NFS_INO_REVAL_PAGECACHE;
1378 1378
1379 if ((fattr->valid & NFS_ATTR_FATTR_MTIME) && !timespec_equal(&inode->i_mtime, &fattr->mtime)) 1379 if ((fattr->valid & NFS_ATTR_FATTR_MTIME) && !timespec_equal(&inode->i_mtime, &fattr->mtime))
@@ -1803,7 +1803,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
1803 1803
1804 /* More cache consistency checks */ 1804 /* More cache consistency checks */
1805 if (fattr->valid & NFS_ATTR_FATTR_CHANGE) { 1805 if (fattr->valid & NFS_ATTR_FATTR_CHANGE) {
1806 if (inode_cmp_iversion_raw(inode, fattr->change_attr)) { 1806 if (!inode_eq_iversion_raw(inode, fattr->change_attr)) {
1807 dprintk("NFS: change_attr change on server for file %s/%ld\n", 1807 dprintk("NFS: change_attr change on server for file %s/%ld\n",
1808 inode->i_sb->s_id, inode->i_ino); 1808 inode->i_sb->s_id, inode->i_ino);
1809 /* Could it be a race with writeback? */ 1809 /* Could it be a race with writeback? */