scsi: sd_zbc: Clean up sd_zbc_parse_report() setting of wp

Make sd_zbc_parse_report() use if/else when setting the write pointer,
instead of setting it unconditionally and then conditionally updating it.

Link: https://lore.kernel.org/r/20211201142821.64650-2-Niklas.Cassel@wdc.com
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
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 749c5e5..4735cc7 100644 (file)
--- a/drivers/scsi/sd_zbc.c
+++ b/drivers/scsi/sd_zbc.c
@@ -61,9 +61,10 @@ static int sd_zbc_parse_report(struct scsi_disk *sdkp, u8 *buf,
        zone.len = logical_to_sectors(sdp, get_unaligned_be64(&buf[8]));
        zone.capacity = zone.len;
        zone.start = logical_to_sectors(sdp, get_unaligned_be64(&buf[16]));
-       zone.wp = logical_to_sectors(sdp, get_unaligned_be64(&buf[24]));
        if (zone.cond == ZBC_ZONE_COND_FULL)
                zone.wp = zone.start + zone.len;
+       else
+               zone.wp = logical_to_sectors(sdp, get_unaligned_be64(&buf[24]));
 
        ret = cb(&zone, idx, data);
        if (ret)