From patchwork Tue Nov 1 09:34:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13582 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2846240wru; Tue, 1 Nov 2022 02:37:39 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7P8V0rzr16qpbQnJLbfD4Mc5aE5NZJh4uFCvlMmd0xkF8B+7DOqdX1WbFrGG/sam1EskZC X-Received: by 2002:a17:903:2cd:b0:182:f36b:31ef with SMTP id s13-20020a17090302cd00b00182f36b31efmr17863764plk.171.1667295459133; Tue, 01 Nov 2022 02:37:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295459; cv=none; d=google.com; s=arc-20160816; b=bYZXUoa/ov/eH+U2ct+lwnpBQ8rFzbsboWC8tve4otHhbbOnU5ZSpDK+OtUYQ+Xs4n Zudff9NfGS8tKrZKtJIGdmLa4aYU0v/SY4nFT8+6rHqIDHJcwBhMLbmX5VNVIeVxIcyB sKzJcdNPFjtZtz2sUCeOka1NICSI4X3sY83aoOp9hMG/MXnqKEfJyLNa/BX9mdu1Oqan AtUWo8MvrwNLjlOvL841g82mvnWiNU3IDiZm4Za0IOxF7efErXiIU3H6w5Rm6QLPW4ic wxeVGtPGed4rd1LO9AeFWx5eZOWQe5Sxk8UJ+ixc1z3btgX6yRwtgLBvk+uw3G4kZCAo iDhw== 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=hHLk4KSBYaQuI3bbOQp5LuZNFQZ3qORrU5tJKRaeTMY=; b=q8Hpf3lWgI70GyY0ql4Q0DVg/ChE1vamBwZD/YCdwKybXDy8G+Ww8vaO7PKBLVIlWD QC9m58cc1Ak0f4gicpbbvl4KdrEyRO6Frm2gB1AKxM2T9ohliQ+1h0IXwpNee3CcNsig hC15BYz7d2DqGpzOgsTvv3OWnM7Uy0Qfr4VyRxjz0iGRxjKkyr+hBtgp9ObUkGlMvsZf 96fpbjy/Vo+LRxdrpsXS8V76bSmbuvBjKboIGFHgllrx1SeXqYAx4WfGg4C7Q7XO8sQC i3KVte//eqSNXcoKEIrP43nJBsO2nLKNBhdmYuwIkuBPxQx3nQMS+CEKmaIwLfHTVPux P4+w== 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 g23-20020a635217000000b0044a0b2e174asi11868335pgb.83.2022.11.01.02.37.25; Tue, 01 Nov 2022 02:37:39 -0700 (PDT) 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 S230302AbiKAJfR (ORCPT + 99 others); Tue, 1 Nov 2022 05:35:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230203AbiKAJei (ORCPT ); Tue, 1 Nov 2022 05:34:38 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5644218E30; Tue, 1 Nov 2022 02:34:30 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N1l8r2g2YzRnsw; Tue, 1 Nov 2022 17:29:32 +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, 1 Nov 2022 17:34:27 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 14/20] block, bfq: remove redundant oom_bfqq check for bfqq from bfq_find_close_cooperator Date: Tue, 1 Nov 2022 17:34:11 +0800 Message-ID: <20221101093417.10540-15-shikemeng@huawei.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20221101093417.10540-1-shikemeng@huawei.com> References: <20221101093417.10540-1-shikemeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.178.129] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) 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?1748286003478340360?= X-GMAIL-MSGID: =?utf-8?q?1748286003478340360?= The oom_bfqq is never added to tree in bfq_pos_tree_add_move, so bfqq returned from bfq_find_close_cooperator is no need to be checked if it's oom_bfqq. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index b8af0bb98d66..776951156fbc 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -3014,8 +3014,7 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq, new_bfqq = bfq_find_close_cooperator(bfqd, bfqq, bfq_io_struct_pos(io_struct, request)); - if (new_bfqq && likely(new_bfqq != &bfqd->oom_bfqq) && - bfq_may_be_close_cooperator(bfqq, new_bfqq)) + if (new_bfqq && bfq_may_be_close_cooperator(bfqq, new_bfqq)) return bfq_setup_merge(bfqq, new_bfqq); return NULL;