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

nvmet: zns: Do not reference the gendisk conv_zones_bitmap 



The gendisk conventional zone bitmap is going away. So to check for the
presence of conventional zones on a zoned target device, always use
report zones.

Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Tested-by: default avatarHans Holmberg <hans.holmberg@wdc.com>
Tested-by: default avatarDennis Maisenbacher <dennis.maisenbacher@wdc.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20240408014128.205141-19-dlemoal@kernel.org


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

drivers/nvme/target/zns.c

+3 −7
Original line number Diff line number Diff line
@@ -52,14 +52,10 @@ bool nvmet_bdev_zns_enable(struct nvmet_ns *ns) 
	if (get_capacity(bd_disk) & (bdev_zone_sectors(ns->bdev) - 1))

		return false;

	/*

	 * ZNS does not define a conventional zone type. If the underlying

	 * device has a bitmap set indicating the existence of conventional

	 * zones, reject the device. Otherwise, use report zones to detect if

	 * the device has conventional zones.

	 * ZNS does not define a conventional zone type. Use report zones

	 * to detect if the device has conventional zones and reject it if

	 * it does.

	 */

	if (ns->bdev->bd_disk->conv_zones_bitmap)

		return false;



	ret = blkdev_report_zones(ns->bdev, 0, bdev_nr_zones(ns->bdev),

				  validate_conv_zones_cb, NULL);

	if (ret < 0)