UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

blk-wbt: pass a gendisk to wbt_init 

Pass a gendisk to wbt_init to prepare for phasing out usage of the
request_queue in the blk-cgroup code.

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-10-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2023-02-03 16:03:50 +01:00 committed by Jens Axboe
parent 04aad37be1
commit 958f296547
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/blk-sysfs.c
View File

@ -500,7 +500,7 @@ static ssize_t queue_wb_lat_store(struct request_queue *q, const char *page,
rqos = wbt_rq_qos(q); rqos = wbt_rq_qos(q);
if (!rqos) { if (!rqos) {
ret = wbt_init(q); ret = wbt_init(q->disk);
if (ret) if (ret)
return ret; return ret;
} }

5
block/blk-wbt.c
View File

@ -671,7 +671,7 @@ void wbt_enable_default(struct gendisk *disk)
return; return;
if (queue_is_mq(q) && !disable_flag) if (queue_is_mq(q) && !disable_flag)
wbt_init(q); wbt_init(disk);
} }
EXPORT_SYMBOL_GPL(wbt_enable_default); EXPORT_SYMBOL_GPL(wbt_enable_default);
@ -835,8 +835,9 @@ static struct rq_qos_ops wbt_rqos_ops = {
#endif #endif
}; };
int wbt_init(struct request_queue *q) int wbt_init(struct gendisk *disk)
{ {
struct request_queue *q = disk->queue;
struct rq_wb *rwb; struct rq_wb *rwb;
int i; int i;
int ret; int ret;

4
block/blk-wbt.h
View File

@ -90,7 +90,7 @@ static inline unsigned int wbt_inflight(struct rq_wb *rwb)
#ifdef CONFIG_BLK_WBT #ifdef CONFIG_BLK_WBT
int wbt_init(struct request_queue *); int wbt_init(struct gendisk *disk);
void wbt_disable_default(struct gendisk *disk); void wbt_disable_default(struct gendisk *disk);
void wbt_enable_default(struct gendisk *disk); void wbt_enable_default(struct gendisk *disk);
@ -104,7 +104,7 @@ u64 wbt_default_latency_nsec(struct request_queue *);
#else #else
static inline int wbt_init(struct request_queue *q) static inline int wbt_init(struct gendisk *disk)
{ {
return -EINVAL; return -EINVAL;
} }