From 2e0a33c72355f58bc1663deaac80f9eafa41174b Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Wed, 28 Aug 2019 15:05:56 -0700 Subject: [PATCH] blkcg: s/RQ_QOS_CGROUP/RQ_QOS_LATENCY/ commit beab17fc2a507e85dd18b3cef83820c5770c5f34 upstream. io.weight is gonna be another rq_qos cgroup mechanism. Let's rename RQ_QOS_CGROUP which is being used by io.latency to RQ_QOS_LATENCY in preparation. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe Signed-off-by: Joseph Qi [Jiufei: remove unused function rq_qos_id_to_name()] Signed-off-by: Jiufei Xue Reviewed-by: Joseph Qi --- block/blk-iolatency.c | 2 +- block/blk-rq-qos.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c index 4f4a614f60fe..2102744d3963 100644 --- a/block/blk-iolatency.c +++ b/block/blk-iolatency.c @@ -693,7 +693,7 @@ int blk_iolatency_init(struct request_queue *q) return -ENOMEM; rqos = &blkiolat->rqos; - rqos->id = RQ_QOS_CGROUP; + rqos->id = RQ_QOS_LATENCY; rqos->ops = &blkcg_iolatency_ops; rqos->q = q; diff --git a/block/blk-rq-qos.h b/block/blk-rq-qos.h index adc48102621e..124cbd2ea269 100644 --- a/block/blk-rq-qos.h +++ b/block/blk-rq-qos.h @@ -9,7 +9,7 @@ enum rq_qos_id { RQ_QOS_WBT, - RQ_QOS_CGROUP, + RQ_QOS_LATENCY, }; struct rq_wait { @@ -65,7 +65,7 @@ static inline struct rq_qos *wbt_rq_qos(struct request_queue *q) static inline struct rq_qos *blkcg_rq_qos(struct request_queue *q) { - return rq_qos_id(q, RQ_QOS_CGROUP); + return rq_qos_id(q, RQ_QOS_LATENCY); } static inline void rq_wait_init(struct rq_wait *rq_wait) -- GitLab