Re: [PATCH] btrfs: collapse report_eb_range() into its single caller

[Qu Wenruo <wqu@suse.com>]

在 2026/4/23 21:08, fdmanana@kernel.org 写道:
> From: Filipe Manana <fdmanana@suse.com>
> 
> There's no point in having this static function since it's too short and
> it has a single caller (check_eb_range()), so move its code into the
> caller and remove it.
> 
> Signed-off-by: Filipe Manana <fdmanana@suse.com>

Reviewed-by: Qu Wenruo <wqu@suse.com>

Thanks,
Qu

> ---
>   fs/btrfs/extent_io.c | 20 +++++++-------------
>   1 file changed, 7 insertions(+), 13 deletions(-)
> 
> diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
> index 6a6d98eec787..2b0aec031a9a 100644
> --- a/fs/btrfs/extent_io.c
> +++ b/fs/btrfs/extent_io.c
> @@ -3976,17 +3976,6 @@ int read_extent_buffer_pages(struct extent_buffer *eb, int mirror_num,
>   	return 0;
>   }
>   
> -static bool report_eb_range(const struct extent_buffer *eb, unsigned long start,
> -			    unsigned long len)
> -{
> -	btrfs_warn(eb->fs_info,
> -		"access to eb bytenr %llu len %u out of range start %lu len %lu",
> -		eb->start, eb->len, start, len);
> -	DEBUG_WARN();
> -
> -	return true;
> -}
> -
>   /*
>    * Check if the [start, start + len) range is valid before reading/writing
>    * the eb.
> @@ -4000,8 +3989,13 @@ static inline int check_eb_range(const struct extent_buffer *eb,
>   	unsigned long offset;
>   
>   	/* start, start + len should not go beyond eb->len nor overflow */
> -	if (unlikely(check_add_overflow(start, len, &offset) || offset > eb->len))
> -		return report_eb_range(eb, start, len);
> +	if (unlikely(check_add_overflow(start, len, &offset) || offset > eb->len)) {
> +		btrfs_warn(eb->fs_info,
> +		   "access to eb bytenr %llu len %u out of range start %lu len %lu",
> +			   eb->start, eb->len, start, len);
> +		DEBUG_WARN();
> +		return true;
> +	}
>   
>   	return false;
>   }