Re: [PATCH 10/17] blk-iocost: pass a gendisk to blk_iocost_init
From: Andreas Herrmann <hidden>
Date: 2022-09-22 12:11:13
On Wed, Sep 21, 2022 at 08:04:54PM +0200, Christoph Hellwig wrote:
Pass the gendisk to blk_iocost_init as part of moving the blk-cgroup infrastructure to be gendisk based. Signed-off-by: Christoph Hellwig <hch@lst.de> --- block/blk-iocost.c | 7 ++++--- block/blk.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)
Reviewed-by: Andreas Herrmann <redacted>
quoted hunk ↗ jump to hunk
diff --git a/block/blk-iocost.c b/block/blk-iocost.c index cba9d3ad58e16..1e7bf0d353227 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c@@ -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));diff --git a/block/blk.h b/block/blk.h index 361db83147c6f..8d5c7a6f52a66 100644 --- a/block/blk.h +++ b/block/blk.h@@ -391,7 +391,7 @@ static inline struct bio *blk_queue_bounce(struct bio *bio, #ifdef CONFIG_BLK_CGROUP_IOLATENCY int blk_iolatency_init(struct gendisk *disk); #else -static int blk_iolatency_init(struct gendisk *disk) { return 0 }; +static int blk_iolatency_init(struct gendisk *disk) { return 0; } #endif #ifdef CONFIG_BLK_DEV_ZONED-- 2.30.2
-- Regards, Andreas SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nürnberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Martje Boudien Moerman (HRB 36809, AG Nürnberg)