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

block: use bdev_is_zoned instead of open coding it 



Use bdev_is_zoned in all places where a block_device is available instead
of open coding it.

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


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

block/bio.c

+1 −1
Original line number Diff line number Diff line
@@ -1033,7 +1033,7 @@ int bio_add_zone_append_page(struct bio *bio, struct page *page, 
	if (WARN_ON_ONCE(bio_op(bio) != REQ_OP_ZONE_APPEND))

		return 0;



	if (WARN_ON_ONCE(!blk_queue_is_zoned(q)))

	if (WARN_ON_ONCE(!bdev_is_zoned(bio->bi_bdev)))

		return 0;



	return bio_add_hw_page(q, bio, page, len, offset,

block/blk-core.c

+3 −3
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ static inline blk_status_t blk_check_zone_append(struct request_queue *q, 
	int nr_sectors = bio_sectors(bio);



	/* Only applicable to zoned block devices */

	if (!blk_queue_is_zoned(q))

	if (!bdev_is_zoned(bio->bi_bdev))

		return BLK_STS_NOTSUPP;



	/* The bio sector must point to the start of a sequential zone */
@@ -775,11 +775,11 @@ void submit_bio_noacct(struct bio *bio) 
	case REQ_OP_ZONE_OPEN:

	case REQ_OP_ZONE_CLOSE:

	case REQ_OP_ZONE_FINISH:

		if (!blk_queue_is_zoned(q))

		if (!bdev_is_zoned(bio->bi_bdev))

			goto not_supported;

		break;

	case REQ_OP_ZONE_RESET_ALL:

		if (!blk_queue_is_zoned(q) || !blk_queue_zone_resetall(q))

		if (!bdev_is_zoned(bio->bi_bdev) || !blk_queue_zone_resetall(q))

			goto not_supported;

		break;

	case REQ_OP_WRITE_ZEROES:

block/blk-mq.h

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ static inline struct blk_plug *blk_mq_plug(struct request_queue *q, 
	 * For regular block devices or read operations, use the context plug

	 * which may be NULL if blk_start_plug() was not executed.

	 */

	if (!blk_queue_is_zoned(q) || !op_is_write(bio_op(bio)))

	if (!bdev_is_zoned(bio->bi_bdev) || !op_is_write(bio_op(bio)))

		return current->plug;



	/* Zoned block device write operation case: do not plug the BIO */

block/blk-zoned.c

+4 −5
Original line number Diff line number Diff line
@@ -149,8 +149,7 @@ int blkdev_report_zones(struct block_device *bdev, sector_t sector, 
	struct gendisk *disk = bdev->bd_disk;

	sector_t capacity = get_capacity(disk);



	if (!blk_queue_is_zoned(bdev_get_queue(bdev)) ||

	    WARN_ON_ONCE(!disk->fops->report_zones))

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

		return -EOPNOTSUPP;



	if (!nr_zones || sector >= capacity)
@@ -268,7 +267,7 @@ int blkdev_zone_mgmt(struct block_device *bdev, enum req_opf op, 
	struct bio *bio = NULL;

	int ret = 0;



	if (!blk_queue_is_zoned(q))

	if (!bdev_is_zoned(bdev))

		return -EOPNOTSUPP;



	if (bdev_read_only(bdev))
@@ -350,7 +349,7 @@ int blkdev_report_zones_ioctl(struct block_device *bdev, fmode_t mode, 
	if (!q)

		return -ENXIO;



	if (!blk_queue_is_zoned(q))

	if (!bdev_is_zoned(bdev))

		return -ENOTTY;



	if (copy_from_user(&rep, argp, sizeof(struct blk_zone_report)))
@@ -408,7 +407,7 @@ int blkdev_zone_mgmt_ioctl(struct block_device *bdev, fmode_t mode, 
	if (!q)

		return -ENXIO;



	if (!blk_queue_is_zoned(q))

	if (!bdev_is_zoned(bdev))

		return -ENOTTY;



	if (!(mode & FMODE_WRITE))

drivers/md/dm-table.c

+1 −1
Original line number Diff line number Diff line
@@ -1623,7 +1623,7 @@ static int device_not_matches_zone_sectors(struct dm_target *ti, struct dm_dev * 
	struct request_queue *q = bdev_get_queue(dev->bdev);

	unsigned int *zone_sectors = data;



	if (!blk_queue_is_zoned(q))

	if (!bdev_is_zoned(dev->bdev))

		return 0;



	return blk_queue_zone_sectors(q) != *zone_sectors;