| Message ID | 20220704124500.155247-15-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: > Use the bdev based helpers instead of the queue based ones to clean up > the code a bit and prepare for storing all zone related fields in > struct gendisk. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com> > --- > block/blk-zoned.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/block/blk-zoned.c b/block/blk-zoned.c > index 836b96ebfdc04..ee8752f083a94 100644 > --- a/block/blk-zoned.c > +++ b/block/blk-zoned.c > @@ -190,8 +190,8 @@ int blkdev_zone_mgmt_all(struct block_device *bdev, unsigned int op, > gfp_t gfp_mask) > { > struct request_queue *q = bdev_get_queue(bdev); > - sector_t capacity = get_capacity(bdev->bd_disk); > - sector_t zone_sectors = blk_queue_zone_sectors(q); > + sector_t capacity = bdev_nr_sectors(bdev); > + sector_t zone_sectors = bdev_zone_sectors(bdev); > unsigned long *need_reset; > struct bio *bio = NULL; > sector_t sector = 0; > @@ -262,8 +262,8 @@ int blkdev_zone_mgmt(struct block_device *bdev, enum req_opf op, > gfp_t gfp_mask) > { > struct request_queue *q = bdev_get_queue(bdev); > - sector_t zone_sectors = blk_queue_zone_sectors(q); > - sector_t capacity = get_capacity(bdev->bd_disk); > + sector_t zone_sectors = bdev_zone_sectors(bdev); > + sector_t capacity = bdev_nr_sectors(bdev); > sector_t end_sector = sector + nr_sectors; > struct bio *bio = NULL; > int ret = 0;
On 7/4/2022 5:44 AM, Christoph Hellwig wrote: > Use the bdev based helpers instead of the queue based ones to clean up > the code a bit and prepare for storing all zone related fields in > struct gendisk. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- Reviewed-by : Chaitanya Kulkarni <kch@nvidia.com> -ck
diff --git a/block/blk-zoned.c b/block/blk-zoned.c index 836b96ebfdc04..ee8752f083a94 100644 --- a/block/blk-zoned.c +++ b/block/blk-zoned.c @@ -190,8 +190,8 @@ int blkdev_zone_mgmt_all(struct block_device *bdev, unsigned int op, gfp_t gfp_mask) { struct request_queue *q = bdev_get_queue(bdev); - sector_t capacity = get_capacity(bdev->bd_disk); - sector_t zone_sectors = blk_queue_zone_sectors(q); + sector_t capacity = bdev_nr_sectors(bdev); + sector_t zone_sectors = bdev_zone_sectors(bdev); unsigned long *need_reset; struct bio *bio = NULL; sector_t sector = 0; @@ -262,8 +262,8 @@ int blkdev_zone_mgmt(struct block_device *bdev, enum req_opf op, gfp_t gfp_mask) { struct request_queue *q = bdev_get_queue(bdev); - sector_t zone_sectors = blk_queue_zone_sectors(q); - sector_t capacity = get_capacity(bdev->bd_disk); + sector_t zone_sectors = bdev_zone_sectors(bdev); + sector_t capacity = bdev_nr_sectors(bdev); sector_t end_sector = sector + nr_sectors; struct bio *bio = NULL; int ret = 0;
Use the bdev based helpers instead of the queue based ones to clean up the code a bit and prepare for storing all zone related fields in struct gendisk. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/blk-zoned.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)