From d6960b3764526d2677508f04731c46c8e15c9b06 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Sat, 29 May 2010 09:46:47 +0000
Subject: [PATCH] --- yaml --- r: 200359 b: refs/heads/master c:
 d327099a23e3d0c8ec09137e9b4b115449d4eb29 h: refs/heads/master i:   200357:
 ae7b1b98f78be48564983472d7db626cae4db53a   200355:
 d0d7d0b34eebcbe06966d48a91f9198b95adbd86   200351:
 d20f7437099073129594e122a3791e2206165430 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/ioctl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 596d33501f3f..f59f4f84996a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4cbd1149fbcc351bdf08ab749867d157905d0d35
+refs/heads/master: d327099a23e3d0c8ec09137e9b4b115449d4eb29
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
index 4cdb98cf26de..9f9a1d9607a7 100644
--- a/trunk/fs/btrfs/ioctl.c
+++ b/trunk/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;