From b1ce5c8ec2c9593a77cdb266b96d2185542842f9 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Mon, 1 Oct 2007 09:56:59 -0400 Subject: [PATCH] --- yaml --- r: 69270 b: refs/heads/master c: 12b373ebf05485d4937dd63a00c16f8efeaa79ba h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/inode.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f0fc6c29164c..76106df079e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f78e4313afd34a4ded591ec5687843113fbaa01 +refs/heads/master: 12b373ebf05485d4937dd63a00c16f8efeaa79ba diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c index 8c53b7eff7ba..7fdaaf5869ce 100644 --- a/trunk/fs/nfs/inode.c +++ b/trunk/fs/nfs/inode.c @@ -1015,10 +1015,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) nfsi->cache_change_attribute = now; } /* If ctime has changed we should definitely clear access+acl caches */ - if (!timespec_equal(&inode->i_ctime, &fattr->ctime)) { + if (!timespec_equal(&inode->i_ctime, &fattr->ctime)) invalid |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL; - nfsi->cache_change_attribute = now; - } } else if (nfsi->change_attr != fattr->change_attr) { dprintk("NFS: change_attr change on server for file %s/%ld\n", inode->i_sb->s_id, inode->i_ino); @@ -1036,7 +1034,6 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) inode->i_size = new_isize; invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA; } - nfsi->cache_change_attribute = now; dprintk("NFS: isize change on server for file %s/%ld\n", inode->i_sb->s_id, inode->i_ino); }