[PATCH 03/26] sd: move zone limits setup out of sd_read_block_characteristics

[Christoph Hellwig <hch@xxxxxx>]

Move a bit of code that sets up the zone flag and the write granularity
into sd_zbc_read_zones to be with the rest of the zoned limits.

Signed-off-by: Christoph Hellwig <hch@xxxxxx>
---
 drivers/scsi/sd.c     | 21 +--------------------
 drivers/scsi/sd_zbc.c |  9 +++++++++
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 664523048ce819..66f7d1e3429c86 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -3312,29 +3312,10 @@ static void sd_read_block_characteristics(struct 
scsi_disk *sdkp,
                blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, q);
        }
 
-
-#ifdef CONFIG_BLK_DEV_ZONED /* sd_probe rejects ZBD devices early otherwise */
-       if (sdkp->device->type == TYPE_ZBC) {
-               lim->zoned = true;
-
-               /*
-                * Per ZBC and ZAC specifications, writes in sequential write
-                * required zones of host-managed devices must be aligned to
-                * the device physical block size.
-                */
-               lim->zone_write_granularity = sdkp->physical_block_size;
-       } else {
-               /*
-                * Host-aware devices are treated as conventional.
-                */
-               lim->zoned = false;
-       }
-#endif /* CONFIG_BLK_DEV_ZONED */
-
        if (!sdkp->first_scan)
                return;
 
-       if (lim->zoned)
+       if (sdkp->device->type == TYPE_ZBC)
                sd_printk(KERN_NOTICE, sdkp, "Host-managed zoned block 
device\n");
        else if (sdkp->zoned == 1)
                sd_printk(KERN_NOTICE, sdkp, "Host-aware SMR disk used as 
regular disk\n");
diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c
index 8cc9c025017961..360ec980499529 100644
--- a/drivers/scsi/sd_zbc.c
+++ b/drivers/scsi/sd_zbc.c
@@ -601,6 +601,15 @@ int sd_zbc_read_zones(struct scsi_disk *sdkp, struct 
queue_limits *lim,
        if (sdkp->device->type != TYPE_ZBC)
                return 0;
 
+       lim->zoned = true;
+
+       /*
+        * Per ZBC and ZAC specifications, writes in sequential write required
+        * zones of host-managed devices must be aligned to the device physical
+        * block size.
+        */
+       lim->zone_write_granularity = sdkp->physical_block_size;
+
        /* READ16/WRITE16/SYNC16 is mandatory for ZBC devices */
        sdkp->device->use_16_for_rw = 1;
        sdkp->device->use_10_for_rw = 0;
-- 
2.43.0