block: use bdev based helpers in blkdev_zone_mgmt{,all}

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>
Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20220706070350.1703384-13-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 2dec25d8aa3bd62d0de47051fc8fa61bd9f1213d..c2d8a38f449aab680d23dd80dd2a1a750523ba67 100644 (file)
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -190,8 +190,8 @@ static int blkdev_zone_reset_all_emulated(struct block_device *bdev,
                                          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;