diff options
| author |   Christoph Hellwig <hch@lst.de> | 2023-02-03 16:03:54 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2023-02-03 08:20:05 -0700 |
| commit | ce57b558604e68277d31ca5ce49ec4579a8618c5 (patch) | |
| tree | 7660aacf0aa4ba3c61bce399935977954622b4d3 /block/blk-wbt.c | |
| parent | blk-rq-qos: move rq_qos_add and rq_qos_del out of line (diff) | |
| download | wireguard-linux-ce57b558604e68277d31ca5ce49ec4579a8618c5.tar.xz wireguard-linux-ce57b558604e68277d31ca5ce49ec4579a8618c5.zip | |
blk-rq-qos: make rq_qos_add and rq_qos_del more useful
Switch to passing a gendisk, and make rq_qos_add initialize all required
fields and drop the not required q argument from rq_qos_del.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Andreas Herrmann <aherrmann@suse.de>
Acked-by: Tejun Heo <tj@kernel.org>
Link: https://lore.kernel.org/r/20230203150400.3199230-14-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-wbt.c')
| -rw-r--r-- | block/blk-wbt.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/block/blk-wbt.c b/block/blk-wbt.c index 119a43671089..75565ae27752 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -932,9 +932,6 @@ int wbt_init(struct gendisk *disk) for (i = 0; i < WBT_NUM_RWQ; i++) rq_wait_init(&rwb->rq_wait[i]); - rwb->rqos.id = RQ_QOS_WBT; - rwb->rqos.ops = &wbt_rqos_ops; - rwb->rqos.q = q; rwb->last_comp = rwb->last_issue = jiffies; rwb->win_nsec = RWB_WINDOW_NSEC; rwb->enable_state = WBT_STATE_ON_DEFAULT; @@ -947,7 +944,7 @@ int wbt_init(struct gendisk *disk) /* * Assign rwb and add the stats callback. */ - ret = rq_qos_add(q, &rwb->rqos); + ret = rq_qos_add(&rwb->rqos, disk, RQ_QOS_WBT, &wbt_rqos_ops); if (ret) goto err_free; |