From: Josef Bacik <jbacik@fb.com>
Date: Wed, 23 Sep 2015 19:00:37 +0000 (-0400)
Subject: Btrfs: end transaction if we abort when creating uuid root
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=65d4f4c151a5fa7b2dacaaf70def3f95001766d7;p=linux.git

Btrfs: end transaction if we abort when creating uuid root

We still need to call btrfs_end_transaction if we call btrfs_abort_transaction,
otherwise we hang and make me super grumpy.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: David Sterba <dsterba@suse.com>
---

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 9c01824eef084..673c72ab4fbe5 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -4230,6 +4230,7 @@ int btrfs_create_uuid_tree(struct btrfs_fs_info *fs_info)
 	if (IS_ERR(uuid_root)) {
 		ret = PTR_ERR(uuid_root);
 		btrfs_abort_transaction(trans, tree_root, ret);
+		btrfs_end_transaction(trans, tree_root);
 		return ret;
 	}