Btrfs: Fix a few functions that exit without stopping their transaction

Signed-off-by: Chris Mason <chris.mason@oracle.com>

2 files changed, 7 insertions, 3 deletions

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index f92b297e7da5..e6a3ba9dd107 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3275,8 +3275,10 @@ next:
         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 faf081302d02..7d40778a90e4 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -78,8 +78,10 @@ static noinline int create_subvol(struct btrfs_root *root, char *name,
         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);