Re: [PATCH 09/17] btrfs: move btrfs_chunk_item_size out of ctree.h

[Qu Wenruo <wqu@suse.com>]

On 2022/9/14 23:06, Josef Bacik wrote:
> This is more of a volumes related helper, additionally it has a BUG_ON()
> which isn't defined in the related header.  Move the code to volumes.c,
> change the BUG_ON() to an ASSERT(), and move the prototype to volumes.h.

Again a very small function, can it be inlined instead?

Thanks,
Qu
> 
> Signed-off-by: Josef Bacik <josef@toxicpanda.com>
> ---
>   fs/btrfs/ctree.h   | 7 -------
>   fs/btrfs/volumes.c | 7 +++++++
>   fs/btrfs/volumes.h | 2 +-
>   3 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
> index 2e6a947a48de..60f8817f5b7c 100644
> --- a/fs/btrfs/ctree.h
> +++ b/fs/btrfs/ctree.h
> @@ -58,13 +58,6 @@ struct btrfs_ioctl_encoded_io_args;
>   
>   #define BTRFS_MAX_EXTENT_SIZE SZ_128M
>   
> -static inline unsigned long btrfs_chunk_item_size(int num_stripes)
> -{
> -	BUG_ON(num_stripes == 0);
> -	return sizeof(struct btrfs_chunk) +
> -		sizeof(struct btrfs_stripe) * (num_stripes - 1);
> -}
> -
>   /*
>    * Runtime (in-memory) states of filesystem
>    */
> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
> index 94ba46d57920..b4de4d5ed69f 100644
> --- a/fs/btrfs/volumes.c
> +++ b/fs/btrfs/volumes.c
> @@ -160,6 +160,13 @@ const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = {
>   	},
>   };
>   
> +unsigned long btrfs_chunk_item_size(int num_stripes)
> +{
> +	ASSERT(num_stripes);
> +	return sizeof(struct btrfs_chunk) +
> +		sizeof(struct btrfs_stripe) * (num_stripes - 1);
> +}
> +
>   /*
>    * Convert block group flags (BTRFS_BLOCK_GROUP_*) to btrfs_raid_types, which
>    * can be used as index to access btrfs_raid_array[].
> diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
> index f19a1cd1bfcf..96a7b437ff20 100644
> --- a/fs/btrfs/volumes.h
> +++ b/fs/btrfs/volumes.h
> @@ -730,5 +730,5 @@ int btrfs_bg_type_to_factor(u64 flags);
>   const char *btrfs_bg_type_to_raid_name(u64 flags);
>   int btrfs_verify_dev_extents(struct btrfs_fs_info *fs_info);
>   bool btrfs_repair_one_zone(struct btrfs_fs_info *fs_info, u64 logical);
> -
> +unsigned long btrfs_chunk_item_size(int num_stripes);
>   #endif