From patchwork Thu Feb 9 19:48:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54894 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp290265wrn; Thu, 9 Feb 2023 04:00:44 -0800 (PST) X-Google-Smtp-Source: AK7set/FfZMI/OFK5vJ+Lp9QRrpPdaDrwgUdc/Ewb9uwBLrlQFN5d+T9z8INIOCF1dqEAfSgsaKb X-Received: by 2002:a17:90b:38ca:b0:230:cc7a:3491 with SMTP id nn10-20020a17090b38ca00b00230cc7a3491mr12571669pjb.24.1675944043787; Thu, 09 Feb 2023 04:00:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675944043; cv=none; d=google.com; s=arc-20160816; b=BB7rhOD5GaZlj7WdsCHBPUq3/p+PTT1vm3CNaOlSVfFBSYL9BwleR4/eFPbdbj5fhE NeBhCcVf5H7i+WKjq0AfFQ7YdZk2K2jX1cuy/C/+Wtw2QsYUzCkk57Hx0U0uRQcvzTvp WKv/zh2zeKiFn6YoGdxQ5zUvDei+tioCFfWalMkFu9kLfJilQk5Vl8/Nds03XEqCZGwd /bUW5/4Juvo1RcHSDk+hKJ0jQ0k5kwOtCQbpgDat99oezKmSYlNHIG6dE9OxOad1ZL2N gZQ/0/6azcW9j9+5BA+RyIu9FrKu7u4SOXtgsHRqHJAhR4rpTJihv5SKoth0j/wJDjBS OK3g== 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=hwrMr5zhRYIbNvsJnNiyrWTtVgVmwOwngxIQMvdZcOQ=; b=Rq3i5gAvuvQ9MNXZj4M0P90MBCJ/WZZveX2qbEl3Pp31sKGCuH/WmAhJs43rNpsYeO Gw9JIw2J3u0GrEMms+mHhIMEJJ0bfQPxAsxCOHLtyT1k/CElwRuY/qAOQuVpibgplLvP aSB+0cYgZ5W7l0G3J2OSWjj4xvEwj0XLHe0F7RdSfY3p+3Fx2gTosaYmDk5x5Bg4qUAu 0DPSYRyhtMG9EazV53EVdYW+pXVb8/Z4OkvUpEoyVigae1f2hP+mSPCkT/uuIpyTXCHp NpKU0iyYHXPSkEdYgaPdIfmPKN2z9U9DwMsYYPPAvl2tUtvbeX4sTYVzDQFilz4SDi0i PuIQ== 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 s12-20020a17090ad48c00b002312812e917si2458631pju.63.2023.02.09.04.00.30; Thu, 09 Feb 2023 04:00:43 -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 S230486AbjBIL6G (ORCPT + 99 others); Thu, 9 Feb 2023 06:58:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229968AbjBIL4Q (ORCPT ); Thu, 9 Feb 2023 06:56:16 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 987325C4B9; Thu, 9 Feb 2023 03:46:33 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PCFSh6kDCz4f3jLm; Thu, 9 Feb 2023 19:46:28 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAn3rEQ3eRjgb0tDQ--.53508S19; Thu, 09 Feb 2023 19:46:30 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 17/21] ext4: remove unnecessary count2 in ext4_free_data_in_buddy Date: Fri, 10 Feb 2023 03:48:21 +0800 Message-Id: <20230209194825.511043-18-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230209194825.511043-1-shikemeng@huaweicloud.com> References: <20230209194825.511043-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAn3rEQ3eRjgb0tDQ--.53508S19 X-Coremail-Antispam: 1UD129KBjvJXoW7KFWkZrWrWry7XF4DurWkXrb_yoW8Jw43pa s8Ca4Uurs5Wr1kuanrCayvqw1Iq3yv9FW7try5ur1rAFy3JryrtFn3tryruFy8tFZ7AF1a vFWq9ryUC3W3G3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBIb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3w A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_Gr0_Xr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwCI42IY 6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aV CY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU0TqcUUUUUU== 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?1757354701388043291?= X-GMAIL-MSGID: =?utf-8?q?1757354701388043291?= count2 is always 1 in mb_debug, just remove unnecessary count2. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 289dcd81dd5a..f9fc461b633f 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -3590,7 +3590,7 @@ static void ext4_free_data_in_buddy(struct super_block *sb, { struct ext4_buddy e4b; struct ext4_group_info *db; - int err, count = 0, count2 = 0; + int err, count = 0; mb_debug(sb, "gonna free %u blocks in group %u (0x%p):", entry->efd_count, entry->efd_group, entry); @@ -3606,7 +3606,6 @@ static void ext4_free_data_in_buddy(struct super_block *sb, db = e4b.bd_info; /* there are blocks to put in buddy to make them really free */ count += entry->efd_count; - count2++; ext4_lock_group(sb, entry->efd_group); /* Take it out of per group rb tree */ rb_erase(&entry->efd_node, &(db->bb_free_root)); @@ -3631,8 +3630,7 @@ static void ext4_free_data_in_buddy(struct super_block *sb, ext4_unlock_group(sb, entry->efd_group); ext4_mb_unload_buddy(&e4b); - mb_debug(sb, "freed %d blocks in %d structures\n", count, - count2); + mb_debug(sb, "freed %d blocks in 1 structures\n", count); } /*