From 35b6f030d0809a1a3eaee164a751d5f8bcc1c944 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Tue, 23 Sep 2008 17:28:42 -0400 Subject: [PATCH] --- yaml --- r: 115382 b: refs/heads/master c: 4dc05efb86239321d43a9d74fd2ecd5c21bfc2ad 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 35c5d64eb329..b4f1a36d8f9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d65f557f39448c2d9e58cd564037b81e646aed2c +refs/heads/master: 4dc05efb86239321d43a9d74fd2ecd5c21bfc2ad diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c index 610d022fc7a5..697157c1fdd1 100644 --- a/trunk/fs/nfs/inode.c +++ b/trunk/fs/nfs/inode.c @@ -724,16 +724,13 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) goto out; } - spin_lock(&inode->i_lock); - status = nfs_update_inode(inode, &fattr); + status = nfs_refresh_inode(inode, &fattr); if (status) { - spin_unlock(&inode->i_lock); dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Ld) refresh failed, error=%d\n", inode->i_sb->s_id, (long long)NFS_FILEID(inode), status); goto out; } - spin_unlock(&inode->i_lock); if (nfsi->cache_validity & NFS_INO_INVALID_ACL) nfs_zap_acl_cache(inode);