---

yaml --- r: 69271 b: refs/heads/master c: 7668fdb h: refs/heads/master i: 69269: 9d9efb7 69267: 83282d6 69263: fb495c9 v: v3
git-mirror · Oct 9, 2007 · 2e965ea · 2e965ea
1 parent b1ce5c8
commit 2e965ea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git 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
@@ -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;
 }
 
 /**