aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ioctl.c
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-05-29 09:46:47 +0000
committerChris Mason <chris.mason@oracle.com>2010-06-11 15:57:35 -0400
commitd327099a23e3d0c8ec09137e9b4b115449d4eb29 (patch)
treebeeb39af28a863e3e0d9e40ea3f1af5e5d05cc96 /fs/btrfs/ioctl.c
parent4cbd1149fbcc351bdf08ab749867d157905d0d35 (diff)
downloadkernel_goldelico_gta04-d327099a23e3d0c8ec09137e9b4b115449d4eb29.zip
kernel_goldelico_gta04-d327099a23e3d0c8ec09137e9b4b115449d4eb29.tar.gz
kernel_goldelico_gta04-d327099a23e3d0c8ec09137e9b4b115449d4eb29.tar.bz2
Btrfs: unwind after btrfs_start_transaction() errors
This was added by a22285a6a3: "Btrfs: Integrate metadata reservation with start_transaction". If we goto out here then we skip all the unwinding and there are locks still held etc. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/ioctl.c')
-rw-r--r--fs/btrfs/ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 4cdb98c..9f9a1d9 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1280,7 +1280,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file,
trans = btrfs_start_transaction(root, 0);
if (IS_ERR(trans)) {
err = PTR_ERR(trans);
- goto out;
+ goto out_up_write;
}
trans->block_rsv = &root->fs_info->global_block_rsv;