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

block: remove queue_max_open_zones and queue_max_active_zones 



Always use the bdev based helpers instead.

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-10-hch@lst.de


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

block/blk-sysfs.c

+2 −2
Original line number Diff line number Diff line
@@ -330,12 +330,12 @@ static ssize_t queue_nr_zones_show(struct request_queue *q, char *page) 


static ssize_t queue_max_open_zones_show(struct request_queue *q, char *page)

{

	return queue_var_show(queue_max_open_zones(q), page);

	return queue_var_show(bdev_max_open_zones(q->disk->part0), page);

}



static ssize_t queue_max_active_zones_show(struct request_queue *q, char *page)

{

	return queue_var_show(queue_max_active_zones(q), page);

	return queue_var_show(bdev_max_active_zones(q->disk->part0), page);

}



static ssize_t queue_nomerges_show(struct request_queue *q, char *page)

include/linux/blkdev.h

+10 −27
Original line number Diff line number Diff line
@@ -702,21 +702,22 @@ static inline void blk_queue_max_open_zones(struct request_queue *q, 
	q->max_open_zones = max_open_zones;

}



static inline unsigned int queue_max_open_zones(const struct request_queue *q)

{

	return q->max_open_zones;

}



static inline void blk_queue_max_active_zones(struct request_queue *q,

		unsigned int max_active_zones)

{

	q->max_active_zones = max_active_zones;

}



static inline unsigned int queue_max_active_zones(const struct request_queue *q)

static inline unsigned int bdev_max_open_zones(struct block_device *bdev)

{

	return bdev->bd_disk->queue->max_open_zones;

}



static inline unsigned int bdev_max_active_zones(struct block_device *bdev)

{

	return q->max_active_zones;

	return bdev->bd_disk->queue->max_active_zones;

}



#else /* CONFIG_BLK_DEV_ZONED */

static inline unsigned int blk_queue_nr_zones(struct request_queue *q)

{
@@ -732,11 +733,11 @@ static inline unsigned int blk_queue_zone_no(struct request_queue *q, 
{

	return 0;

}

static inline unsigned int queue_max_open_zones(const struct request_queue *q)

static inline unsigned int bdev_max_open_zones(struct block_device *bdev)

{

	return 0;

}

static inline unsigned int queue_max_active_zones(const struct request_queue *q)

static inline unsigned int bdev_max_active_zones(struct block_device *bdev)

{

	return 0;

}
@@ -1314,24 +1315,6 @@ static inline sector_t bdev_zone_sectors(struct block_device *bdev) 
	return 0;

}



static inline unsigned int bdev_max_open_zones(struct block_device *bdev)

{

	struct request_queue *q = bdev_get_queue(bdev);



	if (q)

		return queue_max_open_zones(q);

	return 0;

}



static inline unsigned int bdev_max_active_zones(struct block_device *bdev)

{

	struct request_queue *q = bdev_get_queue(bdev);



	if (q)

		return queue_max_active_zones(q);

	return 0;

}



static inline int queue_dma_alignment(const struct request_queue *q)

{

	return q ? q->dma_alignment : 511;