]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
block: cleanup blkdev_report_zones()
authorDamien Le Moal <dlemoal@kernel.org>
Tue, 4 Nov 2025 21:22:37 +0000 (06:22 +0900)
committerJens Axboe <axboe@kernel.dk>
Wed, 5 Nov 2025 15:07:21 +0000 (08:07 -0700)
The variable capacity is used only in one place and so can be removed
and get_capacity(disk) used directly instead.

Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-zoned.c

index 39381f2b2e94716b42bc8b4a71616b8bffe439a7..345a99c0b031b41c0a8db00b456a955955d13c65 100644 (file)
@@ -161,7 +161,6 @@ int blkdev_report_zones(struct block_device *bdev, sector_t sector,
                        unsigned int nr_zones, report_zones_cb cb, void *data)
 {
        struct gendisk *disk = bdev->bd_disk;
-       sector_t capacity = get_capacity(disk);
        struct disk_report_zones_cb_args args = {
                .disk = disk,
                .user_cb = cb,
@@ -171,7 +170,7 @@ int blkdev_report_zones(struct block_device *bdev, sector_t sector,
        if (!bdev_is_zoned(bdev) || WARN_ON_ONCE(!disk->fops->report_zones))
                return -EOPNOTSUPP;
 
-       if (!nr_zones || sector >= capacity)
+       if (!nr_zones || sector >= get_capacity(disk))
                return 0;
 
        return disk->fops->report_zones(disk, sector, nr_zones,