From: Tejun Heo Subject: [PATCH 06/10] blkcg: s/RQ_QOS_CGROUP/RQ_QOS_LATENCY/ Date: Thu, 13 Jun 2019 18:56:16 -0700 Message-ID: <20190614015620.1587672-7-tj@kernel.org> References: <20190614015620.1587672-1-tj@kernel.org> Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=gqosCdj9OpU/EXk2GpDgDRqe9bikXWYuASzuXE6aksc=; b=LZRBEftl8pHb3JlVw9EXTNiKB32j5ZIGY5yrb5L3XZS8fYdZOYMA9L1fa6fKtN7CVD /OPdNZ54hpy/FZhAvt7lAOwiHP6WW+0zKCN4HrpwW/+L9Bi83LwphSV91l0nYM/5JGeT iaE4giJW5buF1sDUCez1A1nGTmW0O7XLQH0yHmq+oKa+MgHS8yf1Uypncw3vl7RDPDxT d3TQjac2zPh3jHYjbasqQoc8FXZ8+rtvpEuvMfDMubSCwKurO/1VXrR3GtHmZXmsXhc6 SX7k5nOA5Vpsl60FqlXqDeE5J9wO+vcpoNkEenDQSvz/5MKuN/osaOTCo2JEhd5suq4P 17Ww== In-Reply-To: <20190614015620.1587672-1-tj@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: axboe@kernel.dk, newella@fb.com, clm@fb.com, josef@toxicpanda.com, dennisz@fb.com, lizefan@huawei.com, hannes@cmpxchg.org Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, kernel-team@fb.com, cgroups@vger.kernel.org, ast@kernel.org, daniel@iogearbox.net, kafai@fb.com, songliubraving@fb.com, yhs@fb.com, bpf@vger.kernel.org, Tejun Heo 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 --- block/blk-iolatency.c | 2 +- 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 fa47a6485725..7d1dbe757063 100644 --- a/block/blk-iolatency.c +++ b/block/blk-iolatency.c @@ -744,7 +744,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 e15b6907b76d..5f8b75826a98 100644 --- a/block/blk-rq-qos.h +++ b/block/blk-rq-qos.h @@ -14,7 +14,7 @@ struct blk_mq_debugfs_attr; enum rq_qos_id { RQ_QOS_WBT, - RQ_QOS_CGROUP, + RQ_QOS_LATENCY, }; struct rq_wait { @@ -74,7 +74,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 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) switch (id) { case RQ_QOS_WBT: return "wbt"; - case RQ_QOS_CGROUP: - return "cgroup"; + case RQ_QOS_LATENCY: + return "latency"; } return "unknown"; } -- 2.17.1