Re: [PATCH 03/21] btrfs: zoned: sink zone check into btrfs_repair_one_zone

[David Sterba <dsterba@suse.cz>]

On Wed, Nov 24, 2021 at 01:30:29AM -0800, Johannes Thumshirn wrote:
> Sink zone check into btrfs_repair_one_zone() so we don't need to do it in
> all callers.
> 
> Also as btrfs_repair_one_zone() doesn't return a sensible error, just
> make it a void function.
> 
> Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
> ---
>  fs/btrfs/extent_io.c |  3 +--
>  fs/btrfs/scrub.c     |  4 ++--
>  fs/btrfs/volumes.c   | 13 ++++++++-----
>  fs/btrfs/volumes.h   |  2 +-
>  4 files changed, 12 insertions(+), 10 deletions(-)
> 
> diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
> index 1654c611d2002..96c2e40887772 100644
> --- a/fs/btrfs/extent_io.c
> +++ b/fs/btrfs/extent_io.c
> @@ -2314,8 +2314,7 @@ static int repair_io_failure(struct btrfs_fs_info *fs_info, u64 ino, u64 start,
>  	ASSERT(!(fs_info->sb->s_flags & SB_RDONLY));
>  	BUG_ON(!mirror_num);
>  
> -	if (btrfs_is_zoned(fs_info))
> -		return btrfs_repair_one_zone(fs_info, logical);
> +	btrfs_repair_one_zone(fs_info, logical);

This changes the flow, is that intended? Previously in zoned mode the
function would end here and won't go down to allocate bio etc, now it
would.

>  	bio = btrfs_bio_alloc(1);
>  	bio->bi_iter.bi_size = 0;