diff options
| author | Christoph Hellwig <hch@infradead.org> | 2011-09-19 00:47:51 +0400 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2011-10-12 06:15:08 +0400 |
| commit | 23bb0be1a237c8732ce1a43140e5cb103a676b92 (patch) | |
| tree | deb4405e0612bf50472040587bbbef398a49888c | |
| parent | 8292d88c5c833fc8b837c3a018fd6d72c35a3231 (diff) | |
| download | linux-23bb0be1a237c8732ce1a43140e5cb103a676b92.tar.xz | |
xfs: unlock the inode before log force in xfs_change_file_space
Let the transaction commit unlock the inode before it potentially causes
a synchronous log force.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
| -rw-r--r-- | fs/xfs/xfs_vnodeops.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index f47ecee8d437..c9c8e8230b21 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c @@ -2349,8 +2349,7 @@ xfs_change_file_space( } xfs_ilock(ip, XFS_ILOCK_EXCL); - - xfs_trans_ijoin(tp, ip); + xfs_trans_ijoin_ref(tp, ip, XFS_ILOCK_EXCL); if ((attr_flags & XFS_ATTR_DMI) == 0) { ip->i_d.di_mode &= ~S_ISUID; @@ -2375,10 +2374,5 @@ xfs_change_file_space( xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); if (attr_flags & XFS_ATTR_SYNC) xfs_trans_set_sync(tp); - - error = xfs_trans_commit(tp, 0); - - xfs_iunlock(ip, XFS_ILOCK_EXCL); - - return error; + return xfs_trans_commit(tp, 0); } |