From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Wed, 15 Aug 2007 16:59:12 +0000 (-0400)
Subject: NFS: nfs_post_op_update_inode() should call nfs_refresh_inode()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=68e8a70d3cae23716f6b2b3872eba10eccea148c;p=deliverable%2Flinux.git

NFS: nfs_post_op_update_inode() should call nfs_refresh_inode()

Ensure that we don't clobber the results from a more recent getattr call...

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 721e511f8ba9..0d98074d0766 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -915,14 +915,14 @@ int nfs_post_op_update_inode(struct inode *inode, struct nfs_fattr *fattr)
 	struct nfs_inode *nfsi = NFS_I(inode);
 	int status = 0;
 
-	spin_lock(&inode->i_lock);
 	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;
+		spin_unlock(&inode->i_lock);
 		goto out;
 	}
-	status = nfs_update_inode(inode, fattr);
+	status = nfs_refresh_inode(inode, fattr);
 out:
-	spin_unlock(&inode->i_lock);
 	return status;
 }