From patchwork Tue Nov 8 04:52:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 16867 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2485419wru; Mon, 7 Nov 2022 20:56:09 -0800 (PST) X-Google-Smtp-Source: AMsMyM6WoKKNctNG5WccRKILI8cHs9nLiNYC19UYLM1zpKi232VgnL3RUiybO4wGN6P1kiwuaARR X-Received: by 2002:a17:906:2a93:b0:78d:b87e:6aab with SMTP id l19-20020a1709062a9300b0078db87e6aabmr51845035eje.157.1667883369450; Mon, 07 Nov 2022 20:56:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667883369; cv=none; d=google.com; s=arc-20160816; b=qtypCzugDQ9e3ieI20AoDzdGGTESTK0uKWYdzCbTxtEw28JKL8H5ZvOlWWIWu/J/7p HVyGTDKOBaoilr0l/vKym1wsA3xdVkM7PBd1CiX0LBMgWU59wJWlnGsp0XKmPxHW+PaI ElvWdk6R5c+Bi1lipjAqxv0Deh8o0B08Kh4iGjYkTLuQ2wCqXpz/d7uhPUx3QRBlqWz6 JlI3/CoWg7AsQMjr/Od8kdjjQFlATkmKUoA3S4644TQHf+0Kv6Bx8x1n7EuryV466Gp8 g4y/R+nCOm3yqvk7WJyntuzMz7v8FAvYONKwyYVRc0BgFxWToVfCV219gS13yVqtwaO8 7yew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=mTVyxTtvuvFm31FVLAG6lca90vlQ8MBnuBQQtyYLs1g=; b=fCKMJh4Bm94iY/I0LVFcBw+vvvlPLnpTuLKByTO40Y8VIUPG7zjlSfjk/FcHiv4/lN fdlLGzHzcHqEl6wblLIObZEWgbWOlbBlhConcQM9Zy33wtvBytxKO0GSBFXfsIMP2CNK XVpFr15pjy160gohE4zKeloTNgngp4D6Uv36vfK9Ebcpnew8lI8y8AT/B2vCskEA+UIa u5MKIpSM1+AfwM+UyReyobzvreiOvYPbSlTOHg5ku3o09ApdutC2hxGgsvgSI1SiqAL4 h/i2wSlkJ538htJkvY8+iuDNhkMLjJiKOFu97mqKK9XYnJ1tYf0VPmlBiN0ST+Zi1QQN GDaw== 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m13-20020a056402430d00b00458bbd3a0d2si13133361edc.602.2022.11.07.20.55.44; Mon, 07 Nov 2022 20:56:09 -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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232308AbiKHEw5 (ORCPT + 99 others); Mon, 7 Nov 2022 23:52:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232967AbiKHEwi (ORCPT ); Mon, 7 Nov 2022 23:52:38 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C7D61C909; Mon, 7 Nov 2022 20:52:32 -0800 (PST) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N5wgV4YjwzHvfn; Tue, 8 Nov 2022 12:52:06 +0800 (CST) Received: from huawei.com (10.174.178.129) by kwepemi500016.china.huawei.com (7.221.188.220) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 8 Nov 2022 12:52:29 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 04/10] block, bfq: use helper macro RQ_BFQQ to get bfqq of request Date: Tue, 8 Nov 2022 12:52:18 +0800 Message-ID: <20221108045224.19092-5-shikemeng@huawei.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20221108045224.19092-1-shikemeng@huawei.com> References: <20221108045224.19092-1-shikemeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.178.129] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemi500016.china.huawei.com (7.221.188.220) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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?1748902471579603137?= X-GMAIL-MSGID: =?utf-8?q?1748902471579603137?= Use helper macro RQ_BFQQ to get bfqq of request. Signed-off-by: Kemeng Shi --- 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 01fa16047eb5..2c4fe286ead7 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -6748,14 +6748,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);