Btrfs: Fix a few functions that exit without stopping their transaction
Signed-off-by: Chris Mason <chris.mason@oracle.com>
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index f92b297..e6a3ba9 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3275,8 +3275,10 @@
ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
if (ret > 0)
ret = -EIO;
- if (ret < 0)
+ if (ret < 0) {
+ btrfs_end_transaction(trans, root);
goto out;
+ }
clear_extent_bits(&info->block_group_cache, key.objectid,
key.objectid + key.offset - 1,
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index faf0813..7d40778 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -78,8 +78,10 @@
leaf = btrfs_alloc_free_block(trans, root, root->leafsize,
objectid, trans->transid, 0, 0,
0, 0);
- if (IS_ERR(leaf))
- return PTR_ERR(leaf);
+ if (IS_ERR(leaf)) {
+ ret = PTR_ERR(leaf);
+ goto fail;
+ }
btrfs_set_header_nritems(leaf, 0);
btrfs_set_header_level(leaf, 0);