Btrfs: end transaction if we abort when creating uuid root

Josef Bacik · kdave · commit 65d4f4c151a5 · 2016-06-01T00:32:42.000+02:00
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 &lt;jbacik@fb.com&gt;
Signed-off-by: David Sterba &lt;dsterba@suse.com&gt;
diff --git 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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -4230,6 +4230,7 @@ int btrfs_create_uuid_tree(struct btrfs_fs_info *fs_info)`
`4230`	`4230`	`if (IS_ERR(uuid_root)) {`
`4231`	`4231`	`ret = PTR_ERR(uuid_root);`
`4232`	`4232`	`btrfs_abort_transaction(trans, tree_root, ret);`
	`4233`	`+ btrfs_end_transaction(trans, tree_root);`
`4233`	`4234`	`return ret;`
`4234`	`4235`	`}`
`4235`	`4236`