| Message ID | 20220704124500.155247-13-hch@lst.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [01/17] block: remove a superflous ifdef in blkdev.h | expand |
Looks good,
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
On 7/4/22 21:44, Christoph Hellwig wrote: > Switch to a gendisk based API in preparation for moving all zone related > fields from the request_queue to the gendisk. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com> > --- > drivers/block/null_blk/zoned.c | 4 ++-- > drivers/nvme/host/zns.c | 4 ++-- > drivers/scsi/sd_zbc.c | 6 +++--- > include/linux/blkdev.h | 8 ++++---- > 4 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/drivers/block/null_blk/zoned.c b/drivers/block/null_blk/zoned.c > index b47bbd114058d..576ab3ed082a5 100644 > --- a/drivers/block/null_blk/zoned.c > +++ b/drivers/block/null_blk/zoned.c > @@ -174,8 +174,8 @@ int null_register_zoned_dev(struct nullb *nullb) > } > > blk_queue_max_zone_append_sectors(q, dev->zone_size_sects); > - blk_queue_max_open_zones(q, dev->zone_max_open); > - blk_queue_max_active_zones(q, dev->zone_max_active); > + disk_set_max_open_zones(nullb->disk, dev->zone_max_open); > + disk_set_max_active_zones(nullb->disk, dev->zone_max_active); > > return 0; > } > diff --git a/drivers/nvme/host/zns.c b/drivers/nvme/host/zns.c > index 0ed15c2fd56de..12316ab51bda6 100644 > --- a/drivers/nvme/host/zns.c > +++ b/drivers/nvme/host/zns.c > @@ -111,8 +111,8 @@ int nvme_update_zone_info(struct nvme_ns *ns, unsigned lbaf) > > disk_set_zoned(ns->disk, BLK_ZONED_HM); > blk_queue_flag_set(QUEUE_FLAG_ZONE_RESETALL, q); > - blk_queue_max_open_zones(q, le32_to_cpu(id->mor) + 1); > - blk_queue_max_active_zones(q, le32_to_cpu(id->mar) + 1); > + disk_set_max_open_zones(ns->disk, le32_to_cpu(id->mor) + 1); > + disk_set_max_active_zones(ns->disk, le32_to_cpu(id->mar) + 1); > free_data: > kfree(id); > return status; > diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c > index 0f5823b674685..b4106f8997342 100644 > --- a/drivers/scsi/sd_zbc.c > +++ b/drivers/scsi/sd_zbc.c > @@ -950,10 +950,10 @@ int sd_zbc_read_zones(struct scsi_disk *sdkp, u8 buf[SD_BUF_SIZE]) > blk_queue_flag_set(QUEUE_FLAG_ZONE_RESETALL, q); > blk_queue_required_elevator_features(q, ELEVATOR_F_ZBD_SEQ_WRITE); > if (sdkp->zones_max_open == U32_MAX) > - blk_queue_max_open_zones(q, 0); > + disk_set_max_open_zones(disk, 0); > else > - blk_queue_max_open_zones(q, sdkp->zones_max_open); > - blk_queue_max_active_zones(q, 0); > + disk_set_max_open_zones(disk, sdkp->zones_max_open); > + disk_set_max_active_zones(disk, 0); > nr_zones = round_up(sdkp->capacity, zone_blocks) >> ilog2(zone_blocks); > > /* > diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h > index a14cc3e46e6ad..e32c147f72868 100644 > --- a/include/linux/blkdev.h > +++ b/include/linux/blkdev.h > @@ -698,16 +698,16 @@ static inline bool blk_queue_zone_is_seq(struct request_queue *q, > return !test_bit(blk_queue_zone_no(q, sector), q->conv_zones_bitmap); > } > > -static inline void blk_queue_max_open_zones(struct request_queue *q, > +static inline void disk_set_max_open_zones(struct gendisk *disk, > unsigned int max_open_zones) > { > - q->max_open_zones = max_open_zones; > + disk->queue->max_open_zones = max_open_zones; > } > > -static inline void blk_queue_max_active_zones(struct request_queue *q, > +static inline void disk_set_max_active_zones(struct gendisk *disk, > unsigned int max_active_zones) > { > - q->max_active_zones = max_active_zones; > + disk->queue->max_active_zones = max_active_zones; > } > > static inline unsigned int bdev_max_open_zones(struct block_device *bdev)
On 7/4/2022 5:44 AM, Christoph Hellwig wrote: > Switch to a gendisk based API in preparation for moving all zone related > fields from the request_queue to the gendisk. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- Reviewed-by : Chaitanya Kulkarni <kch@nvidia.com> -ck
diff --git a/drivers/block/null_blk/zoned.c b/drivers/block/null_blk/zoned.c index b47bbd114058d..576ab3ed082a5 100644 --- a/drivers/block/null_blk/zoned.c +++ b/drivers/block/null_blk/zoned.c @@ -174,8 +174,8 @@ int null_register_zoned_dev(struct nullb *nullb) } blk_queue_max_zone_append_sectors(q, dev->zone_size_sects); - blk_queue_max_open_zones(q, dev->zone_max_open); - blk_queue_max_active_zones(q, dev->zone_max_active); + disk_set_max_open_zones(nullb->disk, dev->zone_max_open); + disk_set_max_active_zones(nullb->disk, dev->zone_max_active); return 0; } diff --git a/drivers/nvme/host/zns.c b/drivers/nvme/host/zns.c index 0ed15c2fd56de..12316ab51bda6 100644 --- a/drivers/nvme/host/zns.c +++ b/drivers/nvme/host/zns.c @@ -111,8 +111,8 @@ int nvme_update_zone_info(struct nvme_ns *ns, unsigned lbaf) disk_set_zoned(ns->disk, BLK_ZONED_HM); blk_queue_flag_set(QUEUE_FLAG_ZONE_RESETALL, q); - blk_queue_max_open_zones(q, le32_to_cpu(id->mor) + 1); - blk_queue_max_active_zones(q, le32_to_cpu(id->mar) + 1); + disk_set_max_open_zones(ns->disk, le32_to_cpu(id->mor) + 1); + disk_set_max_active_zones(ns->disk, le32_to_cpu(id->mar) + 1); free_data: kfree(id); return status; diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c index 0f5823b674685..b4106f8997342 100644 --- a/drivers/scsi/sd_zbc.c +++ b/drivers/scsi/sd_zbc.c @@ -950,10 +950,10 @@ int sd_zbc_read_zones(struct scsi_disk *sdkp, u8 buf[SD_BUF_SIZE]) blk_queue_flag_set(QUEUE_FLAG_ZONE_RESETALL, q); blk_queue_required_elevator_features(q, ELEVATOR_F_ZBD_SEQ_WRITE); if (sdkp->zones_max_open == U32_MAX) - blk_queue_max_open_zones(q, 0); + disk_set_max_open_zones(disk, 0); else - blk_queue_max_open_zones(q, sdkp->zones_max_open); - blk_queue_max_active_zones(q, 0); + disk_set_max_open_zones(disk, sdkp->zones_max_open); + disk_set_max_active_zones(disk, 0); nr_zones = round_up(sdkp->capacity, zone_blocks) >> ilog2(zone_blocks); /* diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index a14cc3e46e6ad..e32c147f72868 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -698,16 +698,16 @@ static inline bool blk_queue_zone_is_seq(struct request_queue *q, return !test_bit(blk_queue_zone_no(q, sector), q->conv_zones_bitmap); } -static inline void blk_queue_max_open_zones(struct request_queue *q, +static inline void disk_set_max_open_zones(struct gendisk *disk, unsigned int max_open_zones) { - q->max_open_zones = max_open_zones; + disk->queue->max_open_zones = max_open_zones; } -static inline void blk_queue_max_active_zones(struct request_queue *q, +static inline void disk_set_max_active_zones(struct gendisk *disk, unsigned int max_active_zones) { - q->max_active_zones = max_active_zones; + disk->queue->max_active_zones = max_active_zones; } static inline unsigned int bdev_max_open_zones(struct block_device *bdev)
Switch to a gendisk based API in preparation for moving all zone related fields from the request_queue to the gendisk. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/block/null_blk/zoned.c | 4 ++-- drivers/nvme/host/zns.c | 4 ++-- drivers/scsi/sd_zbc.c | 6 +++--- include/linux/blkdev.h | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-)