sd: remove sd_is_zoned

Since commit 7437bb73f087 ("block: remove support for the host aware zone
model"), only ZBC devices expose a zoned access model.  sd_is_zoned is
used to check for that and thus return false for host aware devices.

Replace the helper with the simple open coded TYPE_ZBC check to fix this.

Fixes: 7437bb73f087 ("block: remove support for the host aware zone model")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20240617060532.127975-3-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index e01393ed42076b1fd2712b85e63e6543285a0798..664523048ce819919d0042a220582e7ae441565a 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -466,10 +466,6 @@ provisioning_mode_store(struct device *dev, struct device_attribute *attr,
        if (sdp->type != TYPE_DISK)
                return -EINVAL;
 
-       /* ignore the provisioning mode for ZBC devices */
-       if (sd_is_zoned(sdkp))
-               return count;
-
        mode = sysfs_match_string(lbp_mode, buf);
        if (mode < 0)
                return -EINVAL;
@@ -2288,7 +2284,7 @@ static int sd_done(struct scsi_cmnd *SCpnt)
        }
 
  out:
-       if (sd_is_zoned(sdkp))
+       if (sdkp->device->type == TYPE_ZBC)
                good_bytes = sd_zbc_complete(SCpnt, good_bytes, &sshdr);
 
        SCSI_LOG_HLCOMPLETE(1, scmd_printk(KERN_INFO, SCpnt,

diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h
index 726f1613f6cb56b2c00faa6a6f216cdf0a9f9803..7603b3c67b233f4a935fcc68f1fe5fffebcad54c 100644 (file)
--- a/drivers/scsi/sd.h
+++ b/drivers/scsi/sd.h
@@ -222,11 +222,6 @@ static inline sector_t sectors_to_logical(struct scsi_device *sdev, sector_t sec
 
 void sd_dif_config_host(struct scsi_disk *sdkp, struct queue_limits *lim);
 
-static inline int sd_is_zoned(struct scsi_disk *sdkp)
-{
-       return sdkp->zoned == 1 || sdkp->device->type == TYPE_ZBC;
-}
-
 #ifdef CONFIG_BLK_DEV_ZONED
 
 int sd_zbc_read_zones(struct scsi_disk *sdkp, struct queue_limits *lim,

diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c
index f685838d9ed214233d8ef1bc3a8ee6779b0ef91b..8cc9c0250179614202e9266bc016095cb6b0db2c 100644 (file)
--- a/drivers/scsi/sd_zbc.c
+++ b/drivers/scsi/sd_zbc.c
@@ -232,7 +232,7 @@ int sd_zbc_report_zones(struct gendisk *disk, sector_t sector,
        int zone_idx = 0;
        int ret;
 
-       if (!sd_is_zoned(sdkp))
+       if (sdkp->device->type != TYPE_ZBC)
                /* Not a zoned device */
                return -EOPNOTSUPP;
 
@@ -300,7 +300,7 @@ static blk_status_t sd_zbc_cmnd_checks(struct scsi_cmnd *cmd)
        struct scsi_disk *sdkp = scsi_disk(rq->q->disk);
        sector_t sector = blk_rq_pos(rq);
 
-       if (!sd_is_zoned(sdkp))
+       if (sdkp->device->type != TYPE_ZBC)
                /* Not a zoned device */
                return BLK_STS_IOERR;
 
@@ -521,7 +521,7 @@ static int sd_zbc_check_capacity(struct scsi_disk *sdkp, unsigned char *buf,
 
 static void sd_zbc_print_zones(struct scsi_disk *sdkp)
 {
-       if (!sd_is_zoned(sdkp) || !sdkp->capacity)
+       if (sdkp->device->type != TYPE_ZBC || !sdkp->capacity)
                return;
 
        if (sdkp->capacity & (sdkp->zone_info.zone_blocks - 1))
@@ -598,13 +598,8 @@ int sd_zbc_read_zones(struct scsi_disk *sdkp, struct queue_limits *lim,
        u32 zone_blocks = 0;
        int ret;
 
-       if (!sd_is_zoned(sdkp)) {
-               /*
-                * Device managed or normal SCSI disk, no special handling
-                * required.
-                */
+       if (sdkp->device->type != TYPE_ZBC)
                return 0;
-       }
 
        /* READ16/WRITE16/SYNC16 is mandatory for ZBC devices */
        sdkp->device->use_16_for_rw = 1;