From c0c61c86317b5c9fcafdb1a2fc7d9756f2fefc02 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Wed, 15 Aug 2007 12:59:12 -0400 Subject: [PATCH] --- yaml --- r: 69251 b: refs/heads/master c: 68e8a70d3cae23716f6b2b3872eba10eccea148c h: refs/heads/master i: 69249: a5bc1208e562f10af55466289dde4438d585c62d 69247: 3b9923c641ce03fb8e42bb66b018747851a42666 v: v3 --- [refs] | 2 +- trunk/fs/nfs/inode.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 67537cc64a88..293970634d4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2115dc9877d480392e48e3c83bc8cbb4b418fee +refs/heads/master: 68e8a70d3cae23716f6b2b3872eba10eccea148c diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c index 721e511f8ba9..0d98074d0766 100644 --- a/trunk/fs/nfs/inode.c +++ b/trunk/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; }