Commit 958f2965 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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


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

block/blk-sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ static ssize_t queue_wb_lat_store(struct request_queue *q, const char *page, 


	rqos = wbt_rq_qos(q);

	if (!rqos) {

		ret = wbt_init(q);

		ret = wbt_init(q->disk);

		if (ret)

			return ret;

	}

block/blk-wbt.c

+3 −2
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ void wbt_enable_default(struct gendisk *disk) 
		return;



	if (queue_is_mq(q) && !disable_flag)

		wbt_init(q);

		wbt_init(disk);

}

EXPORT_SYMBOL_GPL(wbt_enable_default);
@@ -835,8 +835,9 @@ static struct rq_qos_ops wbt_rqos_ops = { 
#endif

};



int wbt_init(struct request_queue *q)

int wbt_init(struct gendisk *disk)

{

	struct request_queue *q = disk->queue;

	struct rq_wb *rwb;

	int i;

	int ret;

block/blk-wbt.h

+2 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static inline unsigned int wbt_inflight(struct rq_wb *rwb) 


#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_enable_default(struct gendisk *disk);
@@ -104,7 +104,7 @@ u64 wbt_default_latency_nsec(struct request_queue *); 


#else



static inline int wbt_init(struct request_queue *q)

static inline int wbt_init(struct gendisk *disk)

{

	return -EINVAL;

}