From 2e965ea98a8cf5fd30d22852be7328fce578ced5 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Mon, 1 Oct 2007 09:59:15 -0400 Subject: [PATCH] --- yaml --- r: 69271 b: refs/heads/master c: 7668fdbe9aaeab705d1169ac86d0d18a12906d06 h: refs/heads/master i: 69269: 9d9efb73b922d979268e051402b651fc3bfdc7df 69267: 83282d6f369207a2840dada7762e557c34c62187 69263: fb495c9982209b6892b2ed03726a19f4fa05ffde v: v3 --- [refs] | 2 +- trunk/fs/nfs/inode.c | 18 +++++++----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 76106df079e5..7dedba939dca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12b373ebf05485d4937dd63a00c16f8efeaa79ba +refs/heads/master: 7668fdbe9aaeab705d1169ac86d0d18a12906d06 diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c index 7fdaaf5869ce..d722a0e84361 100644 --- a/trunk/fs/nfs/inode.c +++ b/trunk/fs/nfs/inode.c @@ -912,18 +912,14 @@ int nfs_refresh_inode(struct inode *inode, struct nfs_fattr *fattr) int nfs_post_op_update_inode(struct inode *inode, struct nfs_fattr *fattr) { struct nfs_inode *nfsi = NFS_I(inode); - int status = 0; - if (unlikely((fattr->valid & NFS_ATTR_FATTR) == 0)) { - spin_lock(&inode->i_lock); - nfsi->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE; - nfsi->cache_change_attribute = jiffies; - spin_unlock(&inode->i_lock); - goto out; - } - status = nfs_refresh_inode(inode, fattr); -out: - return status; + if (fattr->valid & NFS_ATTR_FATTR) + return nfs_refresh_inode(inode, fattr); + + spin_lock(&inode->i_lock); + nfsi->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE; + spin_unlock(&inode->i_lock); + return 0; } /**