From patchwork Mon Jan 16 09:51:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 43922 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp977064wrn; Sun, 15 Jan 2023 17:55:44 -0800 (PST) X-Google-Smtp-Source: AMrXdXs+kTHJuubEaUehYqHhgMe4yFsNrno1JalhavDJCXiGcQbK1ZleRghRUEM9yhuT8YQk7488 X-Received: by 2002:a17:902:e0ca:b0:193:2fdb:db07 with SMTP id e10-20020a170902e0ca00b001932fdbdb07mr23299867pla.43.1673834144706; Sun, 15 Jan 2023 17:55:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673834144; cv=none; d=google.com; s=arc-20160816; b=Eq09JxKWjpqMI461wE/7Cv5NbKEWP/i756HaFJYrbo5Osy2fQLhq54Bfc1Xwn2oTdd mx3tObJ09O6jMsRDK9dRaZgZ7phZsb3USP507cSrj6NJjMR5E9nsWz6qvuO2vNM6PRSX ak0JQeVvpU48OpWeh1UuJvjqmNGXyvBkurUZOIw48bF8JTqdQYzTu64kWq82nDqRTl+z J5t2dbHryZB0vugQq0AaVJBt0CMHMX+saOCWn+qPfD+UtQaXpu+kBaGmA5P75DgXYN/j lOpDfVgBf8INOj8z8RUA7YcB/la2RlHiygca9UOIikp7H39Hyu2BL8Yl+eK58BJiXHyL qgyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=IiFRsOrsI6/U2VXJksExxMrVTXZItqwcJ9a3/fH8m6U=; b=pFIDoFU8hooyvmo3+y2I0T4rdsbrmB/TbcUts0CPQ+v4PsJ/ptbPk9NUwJ3ZyLVkTc snCCrMZSH1GeBsd3QJlpw0e7VFPlzHv22O+q00vEtf+YMMaTxQ8Vm/i1ygHBZtfApKHY E+mbR5TFvfXADPbhvECnAxmjXeOs3AewkKOr/XXXeyheSxJuDVr4TYZzGvNqZQv1DimW /KakGZfaYX+4WuyaLndfhKWtiLOP7QO10fSewkEPTu/bCda5xVva3oY2W6Cf286FJamC QkgNFh/EhWZTqZvtXxtNZVJWL/0lFNocLZY23+3nj/QdF8VcMGtyZKRTTv4O1vvX0mb0 aDkg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q16-20020a17090311d000b001930df7387bsi30334560plh.304.2023.01.15.17.55.33; Sun, 15 Jan 2023 17:55:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231760AbjAPBxq (ORCPT + 99 others); Sun, 15 Jan 2023 20:53:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231744AbjAPBx3 (ORCPT ); Sun, 15 Jan 2023 20:53:29 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 648FC4C33; Sun, 15 Jan 2023 17:53:27 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4NwFRP6L1Wz4f436w; Mon, 16 Jan 2023 09:53:21 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgD3rbERrsRj9iw3Bw--.37368S6; Mon, 16 Jan 2023 09:53:24 +0800 (CST) From: Kemeng Shi To: jack@suse.com, damien.lemoal@opensource.wdc.com, paolo.valente@linaro.org, axboe@kernel.dk Cc: hch@lst.de, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 4/8] block, bfq: use helper macro RQ_BFQQ to get bfqq of request Date: Mon, 16 Jan 2023 17:51:49 +0800 Message-Id: <20230116095153.3810101-5-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230116095153.3810101-1-shikemeng@huaweicloud.com> References: <20230116095153.3810101-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgD3rbERrsRj9iw3Bw--.37368S6 X-Coremail-Antispam: 1UD129KBjvdXoWrZF47Xry3Xry7Cr4Utw47Jwb_yoWfKFg_Ca y8KF93Jr4kA3y5Zr4FyFWYqF47CFWaqF15ur98tFs8Wa43Canayr9FqrsxZFZ8ua1UCa9x tFn0v343Jr9F9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbS8YFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7 CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jstxDUUUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755142312056921775?= X-GMAIL-MSGID: =?utf-8?q?1755142312056921775?= Use helper macro RQ_BFQQ to get bfqq of request. Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara --- block/bfq-iosched.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 698c5918ad10..6f38a0130034 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -6859,14 +6859,14 @@ static struct bfq_queue *bfq_init_rq(struct request *rq) return NULL; /* - * Assuming that elv.priv[1] is set only if everything is set + * Assuming that RQ_BFQQ(rq) is set only if everything is set * for this rq. This holds true, because this function is * invoked only for insertion or merging, and, after such * events, a request cannot be manipulated any longer before * being removed from bfq. */ - if (rq->elv.priv[1]) - return rq->elv.priv[1]; + if (RQ_BFQQ(rq)) + return RQ_BFQQ(rq); bic = icq_to_bic(rq->elv.icq);