Commit e8ecb21f authored by Damien Le Moal's avatar Damien Le Moal Committed by Jens Axboe
Browse files

block: cleanup blkdev_report_zones() 



The variable capacity is used only in one place and so can be removed
and get_capacity(disk) used directly instead.

Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent bba4322e

block/blk-zoned.c

+1 −2
Original line number Diff line number Diff line
@@ -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,