> On Apr 21, 2022, at 11:30 AM, Bart Van Assche <bvanassche@xxxxxxx> wrote:
>
> Return early in sd_zbc_check_zoned_characteristics() for host-aware
> disks. This patch does not change any functionality but makes a later
> patch easier to read.
>
> Signed-off-by: Damien Le Moal <damien.lemoal@xxxxxxxxxxxxxxxxxx>
> [ bvanassche: extracted this change from a larger patch ]
> Signed-off-by: Bart Van Assche <bvanassche@xxxxxxx>
> ---
> drivers/scsi/sd_zbc.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c
> index ac557a5a65c8..c53e166362b9 100644
> --- a/drivers/scsi/sd_zbc.c
> +++ b/drivers/scsi/sd_zbc.c
> @@ -592,14 +592,15 @@ static int sd_zbc_check_zoned_characteristics(struct scsi_disk *sdkp,
> sdkp->zones_optimal_open = get_unaligned_be32(&buf[8]);
> sdkp->zones_optimal_nonseq = get_unaligned_be32(&buf[12]);
> sdkp->zones_max_open = 0;
> - } else {
> - /* Host-managed */
> - sdkp->urswrz = buf[4] & 1;
> - sdkp->zones_optimal_open = 0;
> - sdkp->zones_optimal_nonseq = 0;
> - sdkp->zones_max_open = get_unaligned_be32(&buf[16]);
> + return 0;
> }
>
> + /* Host-managed */
> + sdkp->urswrz = buf[4] & 1;
> + sdkp->zones_optimal_open = 0;
> + sdkp->zones_optimal_nonseq = 0;
> + sdkp->zones_max_open = get_unaligned_be32(&buf[16]);
> +
> /*
> * Check for unconstrained reads: host-managed devices with
> * constrained reads (drives failing read after write pointer)
Reviewed-by: Himanshu Madhani <himanshu.madhani@xxxxxxxxxx>
--
Himanshu Madhani Oracle Linux Engineering
