scsi: sd: sd_zbc: Return early in sd_zbc_check_zoned_characteristics()

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.

Link: https://lore.kernel.org/r/20220421183023.3462291-6-bvanassche@acm.org
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Acked-by: Douglas Gilbert <dgilbert@interlog.com>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
[ bvanassche: extracted this change from a larger patch ]
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c
index ac557a5a65c870afda5e7af7f4af465b91e937e3..c53e166362b9d38b61c8bcbba6dd6e6b8953efee 100644 (file)
--- 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)