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

scsi: sd: sd_zbc: Use logical blocks as unit when querying zones 

When querying zones, track the position in logical blocks instead of in
sectors. This change slightly simplifies sd_zbc_report_zones().

Link: https://lore.kernel.org/r/20220421183023.3462291-4-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 9a93b9c9

drivers/scsi/sd_zbc.c

+5 −6
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ int sd_zbc_report_zones(struct gendisk *disk, sector_t sector, 
			unsigned int nr_zones, report_zones_cb cb, void *data)

{

	struct scsi_disk *sdkp = scsi_disk(disk);

	sector_t capacity = logical_to_sectors(sdkp->device, sdkp->capacity);

	sector_t lba = sectors_to_logical(sdkp->device, sector);

	unsigned int nr, i;

	unsigned char *buf;

	size_t offset, buflen = 0;
@@ -235,7 +235,7 @@ int sd_zbc_report_zones(struct gendisk *disk, sector_t sector, 
		/* Not a zoned device */

		return -EOPNOTSUPP;



	if (!capacity)

	if (!sdkp->capacity)

		/* Device gone or invalid */

		return -ENODEV;
@@ -243,9 +243,8 @@ int sd_zbc_report_zones(struct gendisk *disk, sector_t sector, 
	if (!buf)

		return -ENOMEM;



	while (zone_idx < nr_zones && sector < capacity) {

		ret = sd_zbc_do_report_zones(sdkp, buf, buflen,

				sectors_to_logical(sdkp->device, sector), true);

	while (zone_idx < nr_zones && lba < sdkp->capacity) {

		ret = sd_zbc_do_report_zones(sdkp, buf, buflen, lba, true);

		if (ret)

			goto out;
@@ -263,7 +262,7 @@ int sd_zbc_report_zones(struct gendisk *disk, sector_t sector, 
			zone_idx++;

		}



		sector += sd_zbc_zone_sectors(sdkp) * i;

		lba += sdkp->zone_blocks * i;

	}



	ret = zone_idx;