Commit 60caf375 authored by Damien Le Moal's avatar Damien Le Moal Committed by Martin K. Petersen
Browse files

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: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Acked-by: default avatarDouglas Gilbert <dgilbert@interlog.com>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
[ bvanassche: extracted this change from a larger patch ]
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 628617be

drivers/scsi/sd_zbc.c

+7 −6
Original line number Diff line number Diff line
@@ -592,13 +592,14 @@ 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 {

		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