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

blk-ioprio: pass a gendisk to blk_ioprio_init and blk_ioprio_exit 



Pass the gendisk to blk_ioprio_init and blk_ioprio_exit 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-8-hch@lst.de


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

block/blk-cgroup.c

+2 −2
Original line number Diff line number Diff line
@@ -1257,7 +1257,7 @@ int blkcg_init_disk(struct gendisk *disk) 
	if (preloaded)

		radix_tree_preload_end();



	ret = blk_ioprio_init(q);

	ret = blk_ioprio_init(disk);

	if (ret)

		goto err_destroy_all;
@@ -1274,7 +1274,7 @@ int blkcg_init_disk(struct gendisk *disk) 
err_throtl_exit:

	blk_throtl_exit(q);

err_ioprio_exit:

	blk_ioprio_exit(q);

	blk_ioprio_exit(disk);

err_destroy_all:

	blkg_destroy_all(q);

	return ret;

block/blk-ioprio.c

+4 −4
Original line number Diff line number Diff line
@@ -202,14 +202,14 @@ void blkcg_set_ioprio(struct bio *bio) 
		bio->bi_ioprio = prio;

}



void blk_ioprio_exit(struct request_queue *q)

void blk_ioprio_exit(struct gendisk *disk)

{

	blkcg_deactivate_policy(q, &ioprio_policy);

	blkcg_deactivate_policy(disk->queue, &ioprio_policy);

}



int blk_ioprio_init(struct request_queue *q)

int blk_ioprio_init(struct gendisk *disk)

{

	return blkcg_activate_policy(q, &ioprio_policy);

	return blkcg_activate_policy(disk->queue, &ioprio_policy);

}



static int __init ioprio_init(void)

block/blk-ioprio.h

+4 −4
Original line number Diff line number Diff line
@@ -9,15 +9,15 @@ struct request_queue; 
struct bio;



#ifdef CONFIG_BLK_CGROUP_IOPRIO

int blk_ioprio_init(struct request_queue *q);

void blk_ioprio_exit(struct request_queue *q);

int blk_ioprio_init(struct gendisk *disk);

void blk_ioprio_exit(struct gendisk *disk);

void blkcg_set_ioprio(struct bio *bio);

#else

static inline int blk_ioprio_init(struct request_queue *q)

static inline int blk_ioprio_init(struct gendisk *disk)

{

	return 0;

}

static inline void blk_ioprio_exit(struct request_queue *q)

static inline void blk_ioprio_exit(struct gendisk *disk)

{

}

static inline void blkcg_set_ioprio(struct bio *bio)