blk-iolatency: pass a gendisk to blk_iolatency_init

Pass the gendisk to blk_iolatency_init as part of moving the blk-cgroup
infrastructure to be gendisk based.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 89974fd0db3dac4ab342efde9c164f3a3d0651ab..82a117ff54de5a299256f0a0314094753c7f0260 100644 (file)
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -1265,7 +1265,7 @@ int blkcg_init_disk(struct gendisk *disk)
        if (ret)
                goto err_ioprio_exit;
 
-       ret = blk_iolatency_init(q);
+       ret = blk_iolatency_init(disk);
        if (ret)
                goto err_throtl_exit;
 

diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c
index e285152345a20a6d6809fddf06c3f470a6a72ccf..c6f61fe88b875cbd46fa6268e9dd4bdc0264a472 100644 (file)
--- a/block/blk-iolatency.c
+++ b/block/blk-iolatency.c
@@ -756,8 +756,9 @@ static void blkiolatency_enable_work_fn(struct work_struct *work)
        }
 }
 
-int blk_iolatency_init(struct request_queue *q)
+int blk_iolatency_init(struct gendisk *disk)
 {
+       struct request_queue *q = disk->queue;
        struct blk_iolatency *blkiolat;
        struct rq_qos *rqos;
        int ret;

diff --git a/block/blk.h b/block/blk.h
index d7142c4d2fefb4a1bfa108fe43fa0ab36e477710..361db83147c6ff85a69d63e4c6d01bc43939aedb 100644 (file)
--- a/block/blk.h
+++ b/block/blk.h
@@ -389,9 +389,9 @@ static inline struct bio *blk_queue_bounce(struct bio *bio,
 }
 
 #ifdef CONFIG_BLK_CGROUP_IOLATENCY
-extern int blk_iolatency_init(struct request_queue *q);
+int blk_iolatency_init(struct gendisk *disk);
 #else
-static inline int blk_iolatency_init(struct request_queue *q) { return 0; }
+static int blk_iolatency_init(struct gendisk *disk) { return 0 };
 #endif
 
 #ifdef CONFIG_BLK_DEV_ZONED