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

btrfs: move btrfs_account_ro_block_groups_free_space into space-info.c 



This was prototyped in ctree.h and the code existed in extent-tree.c,
but it's space-info related so move it into space-info.c.

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 8483d402

fs/btrfs/ctree.h

+0 −1
Original line number Diff line number Diff line
@@ -576,7 +576,6 @@ void btrfs_delalloc_release_extents(struct btrfs_inode *inode, u64 num_bytes); 


int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes,

				    u64 disk_num_bytes, bool noflush);

u64 btrfs_account_ro_block_groups_free_space(struct btrfs_space_info *sinfo);

int btrfs_error_unpin_extent_range(struct btrfs_fs_info *fs_info,

				   u64 start, u64 end);

int btrfs_discard_extent(struct btrfs_fs_info *fs_info, u64 bytenr,

fs/btrfs/extent-tree.c

+0 −34
Original line number Diff line number Diff line
@@ -5975,40 +5975,6 @@ int btrfs_drop_subtree(struct btrfs_trans_handle *trans, 
	return ret;

}



/*

 * helper to account the unused space of all the readonly block group in the

 * space_info. takes mirrors into account.

 */

u64 btrfs_account_ro_block_groups_free_space(struct btrfs_space_info *sinfo)

{

	struct btrfs_block_group *block_group;

	u64 free_bytes = 0;

	int factor;



	/* It's df, we don't care if it's racy */

	if (list_empty(&sinfo->ro_bgs))

		return 0;



	spin_lock(&sinfo->lock);

	list_for_each_entry(block_group, &sinfo->ro_bgs, ro_list) {

		spin_lock(&block_group->lock);



		if (!block_group->ro) {

			spin_unlock(&block_group->lock);

			continue;

		}



		factor = btrfs_bg_type_to_factor(block_group->flags);

		free_bytes += (block_group->length -

			       block_group->used) * factor;



		spin_unlock(&block_group->lock);

	}

	spin_unlock(&sinfo->lock);



	return free_bytes;

}



int btrfs_error_unpin_extent_range(struct btrfs_fs_info *fs_info,

				   u64 start, u64 end)

{

fs/btrfs/space-info.c

+34 −0
Original line number Diff line number Diff line
@@ -1814,3 +1814,37 @@ __cold void btrfs_dump_space_info_for_trans_abort(struct btrfs_fs_info *fs_info) 
	}

	dump_global_block_rsv(fs_info);

}



/*

 * Account the unused space of all the readonly block group in the space_info.

 * takes mirrors into account.

 */

u64 btrfs_account_ro_block_groups_free_space(struct btrfs_space_info *sinfo)

{

	struct btrfs_block_group *block_group;

	u64 free_bytes = 0;

	int factor;



	/* It's df, we don't care if it's racy */

	if (list_empty(&sinfo->ro_bgs))

		return 0;



	spin_lock(&sinfo->lock);

	list_for_each_entry(block_group, &sinfo->ro_bgs, ro_list) {

		spin_lock(&block_group->lock);



		if (!block_group->ro) {

			spin_unlock(&block_group->lock);

			continue;

		}



		factor = btrfs_bg_type_to_factor(block_group->flags);

		free_bytes += (block_group->length -

			       block_group->used) * factor;



		spin_unlock(&block_group->lock);

	}

	spin_unlock(&sinfo->lock);



	return free_bytes;

}

fs/btrfs/space-info.h

+1 −0
Original line number Diff line number Diff line
@@ -236,5 +236,6 @@ int btrfs_reserve_data_bytes(struct btrfs_fs_info *fs_info, u64 bytes, 
			     enum btrfs_reserve_flush_enum flush);

void btrfs_dump_space_info_for_trans_abort(struct btrfs_fs_info *fs_info);

void btrfs_init_async_reclaim_work(struct btrfs_fs_info *fs_info);

u64 btrfs_account_ro_block_groups_free_space(struct btrfs_space_info *sinfo);



#endif /* BTRFS_SPACE_INFO_H */