From: Dan Carpenter <error27@gmail.com>
Date: Sat, 29 May 2010 09:46:47 +0000 (+0000)
Subject: Btrfs: unwind after btrfs_start_transaction() errors
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d327099a23e3d0c8ec09137e9b4b115449d4eb29;p=openwrt%2Fstaging%2Fblogic.git

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>
---

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 4cdb98cf26de..9f9a1d9607a7 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;