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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20231228075141.362560-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2023-12-28 07:51:40 +00:00 committed by Jens Axboe
parent e3d7581cb1
commit 6945a1804e
1 changed files with 3 additions and 4 deletions

View File

@ -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 */