Commit 820c363b authored by Naohiro Aota's avatar Naohiro Aota Committed by David Sterba
Browse files

btrfs: return allocated block group from do_chunk_alloc() 



Return the allocated block group from do_chunk_alloc(). This is a
preparation patch for the next patch.

CC: stable@vger.kernel.org # 5.16+
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Tested-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarNaohiro Aota <naohiro.aota@wdc.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent a690e5f2

fs/btrfs/block-group.c

+13 −3
Original line number Diff line number Diff line
@@ -3451,7 +3451,7 @@ int btrfs_force_chunk_alloc(struct btrfs_trans_handle *trans, u64 type) 
	return btrfs_chunk_alloc(trans, alloc_flags, CHUNK_ALLOC_FORCE);

}



static int do_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags)

static struct btrfs_block_group *do_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags)

{

	struct btrfs_block_group *bg;

	int ret;
@@ -3538,7 +3538,11 @@ static int do_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags) 
out:

	btrfs_trans_release_chunk_metadata(trans);



	return ret;

	if (ret)

		return ERR_PTR(ret);



	btrfs_get_block_group(bg);

	return bg;

}



/*
@@ -3653,6 +3657,7 @@ int btrfs_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags, 
{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_space_info *space_info;

	struct btrfs_block_group *ret_bg;

	bool wait_for_alloc = false;

	bool should_alloc = false;

	int ret = 0;
@@ -3746,9 +3751,14 @@ int btrfs_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags, 
			force_metadata_allocation(fs_info);

	}



	ret = do_chunk_alloc(trans, flags);

	ret_bg = do_chunk_alloc(trans, flags);

	trans->allocating_chunk = false;



	if (IS_ERR(ret_bg))

		ret = PTR_ERR(ret_bg);

	else

		btrfs_put_block_group(ret_bg);



	spin_lock(&space_info->lock);

	if (ret < 0) {

		if (ret == -ENOSPC)