Commit b623e347 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: replace blkdev_nr_zones with bdev_nr_zones 



Pass a block_device instead of a request_queue as that is what most
callers have at hand.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Acked-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Link: https://lore.kernel.org/r/20220706070350.1703384-12-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 982977df

block/blk-zoned.c

+8 −7
Original line number Diff line number Diff line
@@ -108,21 +108,22 @@ void __blk_req_zone_write_unlock(struct request *rq) 
EXPORT_SYMBOL_GPL(__blk_req_zone_write_unlock);



/**

 * blkdev_nr_zones - Get number of zones

 * @disk:	Target gendisk

 * bdev_nr_zones - Get number of zones

 * @bdev:	Target device

 *

 * Return the total number of zones of a zoned block device.  For a block

 * device without zone capabilities, the number of zones is always 0.

 */

unsigned int blkdev_nr_zones(struct gendisk *disk)

unsigned int bdev_nr_zones(struct block_device *bdev)

{

	sector_t zone_sectors = blk_queue_zone_sectors(disk->queue);

	sector_t zone_sectors = bdev_zone_sectors(bdev);



	if (!blk_queue_is_zoned(disk->queue))

	if (!bdev_is_zoned(bdev))

		return 0;

	return (get_capacity(disk) + zone_sectors - 1) >> ilog2(zone_sectors);

	return (bdev_nr_sectors(bdev) + zone_sectors - 1) >>

		ilog2(zone_sectors);

}

EXPORT_SYMBOL_GPL(blkdev_nr_zones);

EXPORT_SYMBOL_GPL(bdev_nr_zones);



/**

 * blkdev_report_zones - Get zones information

block/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ static int blkdev_common_ioctl(struct block_device *bdev, fmode_t mode, 
	case BLKGETZONESZ:

		return put_uint(argp, bdev_zone_sectors(bdev));

	case BLKGETNRZONES:

		return put_uint(argp, blkdev_nr_zones(bdev->bd_disk));

		return put_uint(argp, bdev_nr_zones(bdev));

	case BLKROGET:

		return put_int(argp, bdev_read_only(bdev) != 0);

	case BLKSSZGET: /* get block device logical block size */

drivers/block/null_blk/zoned.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ int null_register_zoned_dev(struct nullb *nullb) 
			return ret;

	} else {

		blk_queue_chunk_sectors(q, dev->zone_size_sects);

		q->nr_zones = blkdev_nr_zones(nullb->disk);

		q->nr_zones = bdev_nr_zones(nullb->disk->part0);

	}



	blk_queue_max_zone_append_sectors(q, dev->zone_size_sects);

drivers/md/dm-zone.c

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ int dm_set_zones_restrictions(struct dm_table *t, struct request_queue *q) 
	 * correct value to be exposed in sysfs queue/nr_zones.

	 */

	WARN_ON_ONCE(queue_is_mq(q));

	q->nr_zones = blkdev_nr_zones(md->disk);

	q->nr_zones = bdev_nr_zones(md->disk->part0);



	/* Check if zone append is natively supported */

	if (dm_table_supports_zone_append(t)) {

drivers/md/dm-zoned-target.c

+2 −3
Original line number Diff line number Diff line
@@ -793,8 +793,7 @@ static int dmz_fixup_devices(struct dm_target *ti) 
			}

			zone_nr_sectors = blk_queue_zone_sectors(q);

			zoned_dev->zone_nr_sectors = zone_nr_sectors;

			zoned_dev->nr_zones =

				blkdev_nr_zones(zoned_dev->bdev->bd_disk);

			zoned_dev->nr_zones = bdev_nr_zones(zoned_dev->bdev);

		}

	} else {

		reg_dev = NULL;
@@ -805,7 +804,7 @@ static int dmz_fixup_devices(struct dm_target *ti) 
		}

		q = bdev_get_queue(zoned_dev->bdev);

		zoned_dev->zone_nr_sectors = blk_queue_zone_sectors(q);

		zoned_dev->nr_zones = blkdev_nr_zones(zoned_dev->bdev->bd_disk);

		zoned_dev->nr_zones = bdev_nr_zones(zoned_dev->bdev);

	}



	if (reg_dev) {