summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJosef Bacik <jbacik@fb.com>2015-09-23 15:00:37 -0400
committerDavid Sterba <dsterba@suse.com>2016-06-01 00:32:42 +0200
commit65d4f4c151a5fa7b2dacaaf70def3f95001766d7 (patch)
treeff33bcf957bee352b99160c4cee70a1c8ebf1e3e /fs
parent1691cf160048c0753036d0b3fad7f239234dab56 (diff)
downloadlinux-65d4f4c151a5fa7b2dacaaf70def3f95001766d7.tar.gz
linux-65d4f4c151a5fa7b2dacaaf70def3f95001766d7.tar.bz2
linux-65d4f4c151a5fa7b2dacaaf70def3f95001766d7.zip
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/volumes.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 9c01824eef08..673c72ab4fbe 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;
}