From patchwork Tue Nov 8 04:52:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 16862 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2485067wru; Mon, 7 Nov 2022 20:54:59 -0800 (PST) X-Google-Smtp-Source: AMsMyM7TnKchYO8cK4k3A/+SO3Pqi7xlSmmlb2r1fRzRH3Hg3JUGV/leE4Ydtewz4krf5SkX3Ge/ X-Received: by 2002:a17:907:1c9e:b0:79e:6d97:5e0 with SMTP id nb30-20020a1709071c9e00b0079e6d9705e0mr49976732ejc.534.1667883299269; Mon, 07 Nov 2022 20:54:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667883299; cv=none; d=google.com; s=arc-20160816; b=OgG+77CMbpPOsZ+mdFW7SqnPra7eM8CoWqlbWhoSa/tLu6vTlAJ3PIanBW2LQ0/Tre RR7kjCt/LH21UOed+r0498IstaHvDlKbwmyiYZYn9k7bYMbZddDTKAvHDjfF0DBfar8J ijiHBH7TPuKF4iZoXz72l4y9WWUGreT6qk+9fkJrXxqwWLmX5cLufBIE3249bIjJidOO wQsHt8F2jKnuqV7aFrFzU+5dDs2csGNerRO8ibcnbi4Szwaup204nU2nKn2fxhcWiRDx S+gGtGNoX3RLkNrq7Vl1ohm2CRM/QEEc2Qzf5OGXUZZc+WWyHq/WuoFHeHN1a3boem0+ aLgg== 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=K9k//iMqnVw52UybEPsNp9kgL4YmZ65wQqeCi/3JWVQ=; b=vlgPeSqrIfIUSHGD7XhENv59an73yO5XLM0DiEHw0ihBkSKz2X+8xrtWjeacFnXNnT g5u/KFjvVG8a29Q8LNxADWoQ3e/wNU9nV6jg1MEnWBWupdNZiSfweH7GIfiuCBkz8S7V diaTMKDbdWBDJU0vALe6LgNUp8URCVUDODx9gFopmNVPw/WMvOFZzyLUPCAdlUGRdpQd 6wz22NZIURhZvSAfaf8mZw3qYimQa7c/vOE8ehJc88YSWRJX2EWIpqw4hl9SUwh1DsB4 dHsz0+RhNc9p8jfA0Q83Gj80CWZn1UMkgmSboM7rVeXLXQIC/ZG+RFHEX87wAK7O17C/ YitQ== 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 ga11-20020a1709070c0b00b00732fa9d3df0si13333059ejc.795.2022.11.07.20.54.35; Mon, 07 Nov 2022 20:54:59 -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 S233315AbiKHExS (ORCPT + 99 others); Mon, 7 Nov 2022 23:53:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233098AbiKHEwm (ORCPT ); Mon, 7 Nov 2022 23:52:42 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE4D8326DE; Mon, 7 Nov 2022 20:52:33 -0800 (PST) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N5wbm6s1szpWBX; Tue, 8 Nov 2022 12:48:52 +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:31 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 07/10] block, bfq: remove redundant check in bfq_put_cooperator Date: Tue, 8 Nov 2022 12:52:21 +0800 Message-ID: <20221108045224.19092-8-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?1748902398090605762?= X-GMAIL-MSGID: =?utf-8?q?1748902398090605762?= We have already avoided a circular list in bfq_setup_merge (see comments in bfq_setup_merge() for details), so bfq_queue will not appear in it's new_bfqq list. Just remove this check. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index be923be48647..cffc5ff66ee6 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -5339,8 +5339,6 @@ void bfq_put_cooperator(struct bfq_queue *bfqq) */ __bfqq = bfqq->new_bfqq; while (__bfqq) { - if (__bfqq == bfqq) - break; next = __bfqq->new_bfqq; bfq_put_queue(__bfqq); __bfqq = next;