Commit 8e8a1e31 authored by Josef Bacik's avatar Josef Bacik Committed by Chris Mason
Browse files

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



Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 7b128766

fs/btrfs/extent-tree.c

+3 −1
Original line number Diff line number Diff line
@@ -3275,8 +3275,10 @@ int btrfs_shrink_extent_tree(struct btrfs_root *root, u64 shrink_start) 
	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,

fs/btrfs/ioctl.c

+4 −2
Original line number Diff line number Diff line
@@ -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);