From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B68B7C3A5A1 for ; Wed, 28 Aug 2019 22:06:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8A3012339E for ; Wed, 28 Aug 2019 22:06:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567029982; bh=rSWO1CkFPfIs7v4WEeMx3ddWt99sy+7M53TmcsDBU3I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BqCaNILsQLCvN6xzoEwvAfg53PmFm2BkH9o7z8AQnuDbybRJzqZeLnBSXJok8/qaN a/oD/Eu+1dL5J9StwXdGrZxttO0Npvfj9MF5jB7ket+5diSSRX/1lVgtV05HdVJiXu epEnvBwjlAQzEvXKt7TuZenEgrTH01vz4a6uEQVM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727190AbfH1WGU (ORCPT ); Wed, 28 Aug 2019 18:06:20 -0400 Received: from mail-qk1-f196.google.com ([209.85.222.196]:42705 "EHLO mail-qk1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727175AbfH1WGU (ORCPT ); Wed, 28 Aug 2019 18:06:20 -0400 Received: by mail-qk1-f196.google.com with SMTP id f13so1122971qkm.9; Wed, 28 Aug 2019 15:06:19 -0700 (PDT) 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=KICYxWKT5dxQPbrCwvbX65RDkKc1Qm5xckGukET75uw=; b=hGSObE46mrzPGCerWrDrpt0b7WXeKGm/n3XDOQo+v8RG3F68dq2ll00C64WPj7mfL5 GdDA5ZzVNIuL+kCHazgDanC19G4392qfBA1Xb7FZTFEfTmDn7yhciq/yEiqxFpcQHd3Z gOdcU067Z0at2ye7SUTC3sAIKBD2aTnYNvweQJfQ+XWQ03CAQS67/Gw6hCeIo7AVloZJ RIiOSpIPM/LmSpABoGyI+J1DL+Pozvqrcb1/uMgF+X5N+u1ODKlXCGxBvGxd9BjaTvax hAmAtuiJ5U6wBH0vmOwPUAatFI6M2rDtKPluGKhGO/nopDx3ejPNk2iLSF3khWNzinZg 15IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=KICYxWKT5dxQPbrCwvbX65RDkKc1Qm5xckGukET75uw=; b=TWJ+w6dLc3De453B3EAbJW19aDXaJWMvENfQpWpPIkhhlvSeF0yArg2KEWFlGsqHG6 bTAmMNn6XH0FuZ76yNBPzC+quN7FWCowVClcQT7TVlkbtxScRNb0AiakW/WbctgHv5VS ddPxtkYs5YN5TXLYrF3anhJNc/np2495jRAsq7/bm0yE8+ZSheMIk+9rdPd7KCaZJW9M 7jzaf9tEjJWxmEcNWzt89LIJHc0aIvUOoDjONLBCTH61iy/Za/28vw8N39///nWJAH4Y riZqg/EJHFCAfOXl+SbQdElwdGMtUhuX6Cj7uc499AmISiRY6z6YREEQRgitv5+O6JfO zLMw== X-Gm-Message-State: APjAAAWhVFhchFcYmQa7TxaFeHEsHDjp5Jc0Zek6ytfI4uewZ0gZ+TX1 U7SXstI7x4ZSpNvo4Bn2v4w= X-Google-Smtp-Source: APXvYqwNHL+b4MezoxJT1oFF0aYSPJlxJoHhK1UiDreYlHlNK+cXv+BR19VbpiAUMRQuqS0P2R6gKw== X-Received: by 2002:a37:4747:: with SMTP id u68mr6491144qka.42.1567029978891; Wed, 28 Aug 2019 15:06:18 -0700 (PDT) Received: from localhost ([2620:10d:c091:500::1:c231]) by smtp.gmail.com with ESMTPSA id 1sm251429qko.73.2019.08.28.15.06.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Aug 2019 15:06:18 -0700 (PDT) From: Tejun Heo 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, Tejun Heo Subject: [PATCH 06/10] blkcg: s/RQ_QOS_CGROUP/RQ_QOS_LATENCY/ Date: Wed, 28 Aug 2019 15:05:56 -0700 Message-Id: <20190828220600.2527417-7-tj@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190828220600.2527417-1-tj@kernel.org> References: <20190828220600.2527417-1-tj@kernel.org> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org 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 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) 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