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

blk-iocost: pass a gendisk to blk_iocost_init 



Pass the gendisk to blk_iocost_init as part of moving the blk-cgroup
infrastructure to be gendisk based.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAndreas Herrmann <aherrmann@suse.de>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Link: https://lore.kernel.org/r/20220921180501.1539876-11-hch@lst.de


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

block/blk-iocost.c

+4 −3
Original line number Diff line number Diff line
@@ -2828,8 +2828,9 @@ static struct rq_qos_ops ioc_rqos_ops = { 
	.exit = ioc_rqos_exit,

};



static int blk_iocost_init(struct request_queue *q)

static int blk_iocost_init(struct gendisk *disk)

{

	struct request_queue *q = disk->queue;

	struct ioc *ioc;

	struct rq_qos *rqos;

	int i, cpu, ret;
@@ -3178,7 +3179,7 @@ static ssize_t ioc_qos_write(struct kernfs_open_file *of, char *input, 


	ioc = q_to_ioc(bdev_get_queue(bdev));

	if (!ioc) {

		ret = blk_iocost_init(bdev_get_queue(bdev));

		ret = blk_iocost_init(bdev->bd_disk);

		if (ret)

			goto err;

		ioc = q_to_ioc(bdev_get_queue(bdev));
@@ -3345,7 +3346,7 @@ static ssize_t ioc_cost_model_write(struct kernfs_open_file *of, char *input, 


	ioc = q_to_ioc(bdev_get_queue(bdev));

	if (!ioc) {

		ret = blk_iocost_init(bdev_get_queue(bdev));

		ret = blk_iocost_init(bdev->bd_disk);

		if (ret)

			goto err;

		ioc = q_to_ioc(bdev_get_queue(bdev));