Commit 6945a180 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

sd: remove the !ZBC && blk_queue_is_zoned case in sd_read_block_characteristics 



Now that host-aware devices are always treated as conventional this case
can't happen.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20231228075141.362560-2-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e3d7581c

drivers/scsi/sd.c

+3 −4
Original line number Diff line number Diff line
@@ -3149,12 +3149,11 @@ static void sd_read_block_characteristics(struct scsi_disk *sdkp) 
		 * the device physical block size.

		 */

		blk_queue_zone_write_granularity(q, sdkp->physical_block_size);

	} else if (blk_queue_is_zoned(q)) {

	} else {

		/*

		 * Anything else.  This includes host-aware device that we treat

		 * as conventional.

		 * Host-aware devices are treated as conventional.

		 */

		disk_clear_zoned(sdkp->disk);

		WARN_ON_ONCE(blk_queue_is_zoned(q));

	}

#endif /* CONFIG_BLK_DEV_ZONED */