scsi: sd_zbc: Rearrange code (5eed92d1) · Commits · 戴 / test

Rearrange sd_zbc_setup() to include use_16_for_rw and use_10_for_rw assignments and move the calculation of sdkp->zone_shift together with the assignment of the verified zone_blocks value in sd_zbc_check_zone_size(). No functional change is introduced by this patch. Signed-off-by:

Damien Le Moal <damien.lemoal@wdc.com> Reviewed-by:

Christoph Hellwig <hch@lst.de> Reviewed-by:

Bart Van Assche <Bart.VanAssche@wdc.com> Signed-off-by:

Martin K. Petersen <martin.petersen@oracle.com>

drivers/scsi/sd_zbc.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -584,6 +584,7 @@ out:
		}

		sdkp->zone_blocks = zone_blocks;
		sdkp->zone_shift = ilog2(zone_blocks);

		return 0;
		}
		@@ -591,10 +592,13 @@ out:
		static int sd_zbc_setup(struct scsi_disk *sdkp)
		{

		/* READ16/WRITE16 is mandatory for ZBC disks */
		sdkp->device->use_16_for_rw = 1;
		sdkp->device->use_10_for_rw = 0;

		/* chunk_sectors indicates the zone size */
		blk_queue_chunk_sectors(sdkp->disk->queue,
		logical_to_sectors(sdkp->device, sdkp->zone_blocks));
		sdkp->zone_shift = ilog2(sdkp->zone_blocks);
		sdkp->nr_zones = sdkp->capacity >> sdkp->zone_shift;
		if (sdkp->capacity & (sdkp->zone_blocks - 1))
		sdkp->nr_zones++;
		@@ -657,10 +661,6 @@ int sd_zbc_read_zones(struct scsi_disk sdkp, unsigned char buf)
		if (ret)
		goto err;

		/* READ16/WRITE16 is mandatory for ZBC disks */
		sdkp->device->use_16_for_rw = 1;
		sdkp->device->use_10_for_rw = 0;

		return 0;

		err:

Admin message