diff options
author | Tejun Heo <tj@kernel.org> | 2019-08-28 18:05:56 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2019-08-28 23:17:08 -0400 |
commit | beab17fc2a507e85dd18b3cef83820c5770c5f34 (patch) | |
tree | 097e8aef723ed81e08045ace0271fe5571a9b370 /block | |
parent | 9677a3e01f838622d2efc9a3ccb97090a2c3156a (diff) |
blkcg: s/RQ_QOS_CGROUP/RQ_QOS_LATENCY/
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 <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-iolatency.c | 2 | ||||
-rw-r--r-- | block/blk-rq-qos.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c index 46fa6449f4bb..c128d50cb410 100644 --- a/block/blk-iolatency.c +++ b/block/blk-iolatency.c | |||
@@ -725,7 +725,7 @@ int blk_iolatency_init(struct request_queue *q) | |||
725 | return -ENOMEM; | 725 | return -ENOMEM; |
726 | 726 | ||
727 | rqos = &blkiolat->rqos; | 727 | rqos = &blkiolat->rqos; |
728 | rqos->id = RQ_QOS_CGROUP; | 728 | rqos->id = RQ_QOS_LATENCY; |
729 | rqos->ops = &blkcg_iolatency_ops; | 729 | rqos->ops = &blkcg_iolatency_ops; |
730 | rqos->q = q; | 730 | rqos->q = q; |
731 | 731 | ||
diff --git a/block/blk-rq-qos.h b/block/blk-rq-qos.h index e15b6907b76d..5f8b75826a98 100644 --- a/block/blk-rq-qos.h +++ b/block/blk-rq-qos.h | |||
@@ -14,7 +14,7 @@ struct blk_mq_debugfs_attr; | |||
14 | 14 | ||
15 | enum rq_qos_id { | 15 | enum rq_qos_id { |
16 | RQ_QOS_WBT, | 16 | RQ_QOS_WBT, |
17 | RQ_QOS_CGROUP, | 17 | RQ_QOS_LATENCY, |
18 | }; | 18 | }; |
19 | 19 | ||
20 | struct rq_wait { | 20 | struct rq_wait { |
@@ -74,7 +74,7 @@ static inline struct rq_qos *wbt_rq_qos(struct request_queue *q) | |||
74 | 74 | ||
75 | static inline struct rq_qos *blkcg_rq_qos(struct request_queue *q) | 75 | static inline struct rq_qos *blkcg_rq_qos(struct request_queue *q) |
76 | { | 76 | { |
77 | return rq_qos_id(q, RQ_QOS_CGROUP); | 77 | return rq_qos_id(q, RQ_QOS_LATENCY); |
78 | } | 78 | } |
79 | 79 | ||
80 | static inline const char *rq_qos_id_to_name(enum rq_qos_id id) | 80 | static inline const char *rq_qos_id_to_name(enum rq_qos_id id) |
@@ -82,8 +82,8 @@ static inline const char *rq_qos_id_to_name(enum rq_qos_id id) | |||
82 | switch (id) { | 82 | switch (id) { |
83 | case RQ_QOS_WBT: | 83 | case RQ_QOS_WBT: |
84 | return "wbt"; | 84 | return "wbt"; |
85 | case RQ_QOS_CGROUP: | 85 | case RQ_QOS_LATENCY: |
86 | return "cgroup"; | 86 | return "latency"; |
87 | } | 87 | } |
88 | return "unknown"; | 88 | return "unknown"; |
89 | } | 89 | } |