diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-06-06 20:21:25 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-06-06 20:21:28 +0200 |
commit | 75b5032212641f6d38ac041416945e70da833b68 (patch) | |
tree | bb827401e00c1681a29e75ade3b4ecc903df1a54 /fs/xfs/xfs_dfrag.c | |
parent | 0b73da3f40128eab6ca2a07508f424029a1edaeb (diff) | |
parent | b87297fb405ef13cac375f202d114323b076a56d (diff) | |
download | linux-stable-75b5032212641f6d38ac041416945e70da833b68.tar.gz linux-stable-75b5032212641f6d38ac041416945e70da833b68.tar.bz2 linux-stable-75b5032212641f6d38ac041416945e70da833b68.zip |
Merge branch 'linus' into perfcounters/core
Merge reason: Pick up the latest fixes before the -v8 perfcounters
release.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/xfs/xfs_dfrag.c')
-rw-r--r-- | fs/xfs/xfs_dfrag.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/xfs/xfs_dfrag.c b/fs/xfs/xfs_dfrag.c index e6d839bddbf0..7465f9ee125f 100644 --- a/fs/xfs/xfs_dfrag.c +++ b/fs/xfs/xfs_dfrag.c @@ -347,13 +347,15 @@ xfs_swap_extents( error = xfs_trans_commit(tp, XFS_TRANS_SWAPEXT); -out_unlock: - xfs_iunlock(ip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL); - xfs_iunlock(tip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL); out: kmem_free(tempifp); return error; +out_unlock: + xfs_iunlock(ip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL); + xfs_iunlock(tip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL); + goto out; + out_trans_cancel: xfs_trans_cancel(tp, 0); goto out_unlock; |