Commit ade4b516 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: export block group accounting helpers 



Want to move these functions into block-group.c, so export them.

Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 77745c05

fs/btrfs/block-group.h

+6 −0
Original line number Diff line number Diff line
@@ -192,6 +192,12 @@ void btrfs_dec_block_group_ro(struct btrfs_block_group_cache *cache); 
int btrfs_start_dirty_block_groups(struct btrfs_trans_handle *trans);

int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans);

int btrfs_setup_space_cache(struct btrfs_trans_handle *trans);

int btrfs_update_block_group(struct btrfs_trans_handle *trans,

			     u64 bytenr, u64 num_bytes, int alloc);

int btrfs_add_reserved_bytes(struct btrfs_block_group_cache *cache,

			     u64 ram_bytes, u64 num_bytes, int delalloc);

void btrfs_free_reserved_bytes(struct btrfs_block_group_cache *cache,

			       u64 num_bytes, int delalloc);



static inline int btrfs_block_group_cache_done(

		struct btrfs_block_group_cache *cache)

fs/btrfs/extent-tree.c

+10 −11
Original line number Diff line number Diff line
@@ -2898,7 +2898,7 @@ int btrfs_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags, 
	return ret;

}



static int update_block_group(struct btrfs_trans_handle *trans,

int btrfs_update_block_group(struct btrfs_trans_handle *trans,

			     u64 bytenr, u64 num_bytes, int alloc)

{

	struct btrfs_fs_info *info = trans->fs_info;
@@ -3199,7 +3199,7 @@ btrfs_inc_block_group_reservations(struct btrfs_block_group_cache *bg) 
 * reservation and the block group has become read only we cannot make the

 * reservation and return -EAGAIN, otherwise this function always succeeds.

 */

static int btrfs_add_reserved_bytes(struct btrfs_block_group_cache *cache,

int btrfs_add_reserved_bytes(struct btrfs_block_group_cache *cache,

			     u64 ram_bytes, u64 num_bytes, int delalloc)

{

	struct btrfs_space_info *space_info = cache->space_info;
@@ -3233,8 +3233,7 @@ static int btrfs_add_reserved_bytes(struct btrfs_block_group_cache *cache, 
 * A and before transaction A commits you free that leaf, you call this with

 * reserve set to 0 in order to clear the reservation.

 */



static void btrfs_free_reserved_bytes(struct btrfs_block_group_cache *cache,

void btrfs_free_reserved_bytes(struct btrfs_block_group_cache *cache,

			       u64 num_bytes, int delalloc)

{

	struct btrfs_space_info *space_info = cache->space_info;
@@ -3705,7 +3704,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans, 
			goto out;

		}



		ret = update_block_group(trans, bytenr, num_bytes, 0);

		ret = btrfs_update_block_group(trans, bytenr, num_bytes, 0);

		if (ret) {

			btrfs_abort_transaction(trans, ret);

			goto out;
@@ -4770,7 +4769,7 @@ static int alloc_reserved_file_extent(struct btrfs_trans_handle *trans, 
	if (ret)

		return ret;



	ret = update_block_group(trans, ins->objectid, ins->offset, 1);

	ret = btrfs_update_block_group(trans, ins->objectid, ins->offset, 1);

	if (ret) { /* -ENOENT, logic error */

		btrfs_err(fs_info, "update block group failed for %llu %llu",

			ins->objectid, ins->offset);
@@ -4860,7 +4859,7 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans, 
	if (ret)

		return ret;



	ret = update_block_group(trans, extent_key.objectid,

	ret = btrfs_update_block_group(trans, extent_key.objectid,

				       fs_info->nodesize, 1);

	if (ret) { /* -ENOENT, logic error */

		btrfs_err(fs_info, "update block group failed for %llu %llu",