From patchwork Tue Nov 1 09:34:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13588 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2847208wru; Tue, 1 Nov 2022 02:39:40 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4mOeFVZR/msTzxaPjbWDtj7Qh8IMD34AbU82WBBuia36PeKxrwBE8pKLZn/rojsINbJ37s X-Received: by 2002:a05:6a00:16c4:b0:535:890:d52 with SMTP id l4-20020a056a0016c400b0053508900d52mr18727299pfc.9.1667295580160; Tue, 01 Nov 2022 02:39:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295580; cv=none; d=google.com; s=arc-20160816; b=vR21APZ+gs3hk+POtg94KGJhRIQStGuiNF1nqJolYZNxBJ/kH9a7YbKIzQDuDTGFjN 45nYckpM/0ODpx7/IknXZgtfL46n1ek1PSDl/wduvCUSskN2QbEzlJzblTQABF2hqutX 1s64F7b9AGaK3sWGjUdUYDrLtB/s2ZpO/JN4opT3Tnxjr9lIfWA6mmsgaXQlDyMW7Gim mvW81FFybeQXFhoth7u2WMSzM9qJf960i/8C2H1QRNyijQ8a0bjuqGUqyhNf4vZVOjgx vkAPjBLrX3G2LjBTH/7gepJaHi5OFS/G8u0PR8QVBxLt0ViEyMJntTc0azGRczyBbUOt Fuww== 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=IddvZ5eOU0SzhSoKwM8QpMkVhssvwRL1GS61izpXw3g=; b=GluZOnJDH8O27KH2DL39Tqn4ip7NMSKCEKW3SLMuSfzPpGCjRUvwVLR/SEMmaZTtbh 1nxq8C689teDNuXu4ASRsuikBXW5TmMiYbg16BcwJxiygzOZSTANCZWH/9LY7DQIoq7R m/NU7M6z0NPu/JOUhxDZfsHqicyefh7FyF+XgsmkDv6xqitPcU+nBbI8NZvFTdwD6FPu svArgt5eazi31o41tSbD4ZLzcNK8OyOSi5lsYTSF+amovXWK4KkZwjghyKFWbmE0YVWD pIAeMRma7iL24qoSb5F9Xud0Pux1VZIvS3hr6l05oUr+hU3G/rQDKj0NyuCKF8GfRM5C Y1fw== 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.39.26; Tue, 01 Nov 2022 02:39:40 -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 S230318AbiKAJf1 (ORCPT + 99 others); Tue, 1 Nov 2022 05:35:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230214AbiKAJen (ORCPT ); Tue, 1 Nov 2022 05:34:43 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B0CF1902C; Tue, 1 Nov 2022 02:34:31 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.57]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4N1lCD6NPRzJnMm; Tue, 1 Nov 2022 17:31:36 +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:29 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 16/20] block, bfq: remove unnecessary goto tag in __bfq_weights_tree_remove Date: Tue, 1 Nov 2022 17:34:13 +0800 Message-ID: <20221101093417.10540-17-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?1748286129868675128?= X-GMAIL-MSGID: =?utf-8?q?1748286129868675128?= Do free work if num_active == 0 and remove unnecessary tag reset_entity_pointer. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index dd9a51255a0f..1402dfd9f448 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -950,13 +950,11 @@ void __bfq_weights_tree_remove(struct bfq_data *bfqd, return; bfqq->weight_counter->num_active--; - if (bfqq->weight_counter->num_active > 0) - goto reset_entity_pointer; - - rb_erase_cached(&bfqq->weight_counter->weights_node, root); - kfree(bfqq->weight_counter); + if (bfqq->weight_counter->num_active == 0) { + rb_erase_cached(&bfqq->weight_counter->weights_node, root); + kfree(bfqq->weight_counter); + } -reset_entity_pointer: bfqq->weight_counter = NULL; bfq_put_queue(bfqq); }