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

block: refactor blkdev_report_zones() code 



In preparation for implementing cached report zone, split the main part
of the code of blkdev_report_zones() into the helper function
blkdev_do_report_zones(), with this new helper taking as argument a
struct blk_report_zones_args pointer instead of a report callback
function and its private argument.

No functional changes.

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

block/blk-zoned.c

+16 −8
Original line number Diff line number Diff line
@@ -205,6 +205,21 @@ struct blk_report_zones_args { 
	void		*data;

};



static int blkdev_do_report_zones(struct block_device *bdev, sector_t sector,

				  unsigned int nr_zones,

				  struct blk_report_zones_args *args)

{

	struct gendisk *disk = bdev->bd_disk;



	if (!bdev_is_zoned(bdev) || WARN_ON_ONCE(!disk->fops->report_zones))

		return -EOPNOTSUPP;



	if (!nr_zones || sector >= get_capacity(disk))

		return 0;



	return disk->fops->report_zones(disk, sector, nr_zones, args);

}



/**

 * blkdev_report_zones - Get zones information

 * @bdev:	Target block device
@@ -227,19 +242,12 @@ struct blk_report_zones_args { 
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;

	struct blk_report_zones_args args = {

		.cb = cb,

		.data = data,

	};



	if (!bdev_is_zoned(bdev) || WARN_ON_ONCE(!disk->fops->report_zones))

		return -EOPNOTSUPP;



	if (!nr_zones || sector >= get_capacity(disk))

		return 0;



	return disk->fops->report_zones(disk, sector, nr_zones, &args);

	return blkdev_do_report_zones(bdev, sector, nr_zones, &args);

}

EXPORT_SYMBOL_GPL(blkdev_report_zones);