From patchwork Thu Feb 9 19:48:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54881 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp289037wrn; Thu, 9 Feb 2023 03:58:18 -0800 (PST) X-Google-Smtp-Source: AK7set93qOvPjKnii/wiAyClVzNBINc4IQZBM8XTVzDzRfgPGKU0v0/+aRB6DEUhR0e4NWquhoFL X-Received: by 2002:aa7:943b:0:b0:5a7:6568:2a09 with SMTP id y27-20020aa7943b000000b005a765682a09mr8886164pfo.2.1675943897981; Thu, 09 Feb 2023 03:58:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675943897; cv=none; d=google.com; s=arc-20160816; b=gDj7uSeD3Hp6eyBgLjdLDzZ+pTgisiWba6j6W8NtE5+i+fbN0HYpBCrEGfl4sUV8+h RXH+Hd5yWNwlmb9ZtdNUAST8Hw9Ny3Tl9SV9C2LUT/zquje9A523DaS5afm2XupTSCwU /n1rvFECuO6MwSOIupCkF4O5TC1WHVI6YZ+5BUgmYD5Fad2Ld4TPNdJPqBmUACAZ6sna jU9F7x7Cfr6aBeDBvJoksLhxOojatuZWPvrPNjCeOM1p48TO5tTJPkdtdLQ2rTxknpZx dLwWTT9WQ9s+vEp6zjWyUaDQ5ew3IWilR7PyqV9cv5CC+CC+UZ1gOr7XWtfQ7YHcUWXO YgCw== 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=liMdx/FMFfoSyQWU5VuakLmBqRVOitUTW28BlDJeu7A=; b=MS+TwGOB3teKrW+YhL/i/3WpnwJcjChTLVHk2VclaYESQFtdu3q5imWJZxDol6ZcSh A2ZSfXcgpWzV04AmwFha3tbN0WGMSiFtvBNAksI4iuFA/XhcZO4Y0MdgtUUvWS6rX9J3 ghMAjYFESFtp27x2cA7ldw5DZMITkbG5gSBC28EBdZdMiP14G09EqPvDByTlbcp63RAm fiHWoEse7z3mseS3SC3BnQYWjWH2uFp0iE/yqyAyTcHD8a3H0/uhZRsOg4YeRZ+jYB5g 2e3kqCnJFK1rRzoTpfvcCbpOcMdTGctRXuxW2Re6vkuO20jQ02C9ai7NQ7XrOt8TDKJu mFqQ== 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 z8-20020aa79f88000000b00592a19cde96si1556227pfr.369.2023.02.09.03.58.05; Thu, 09 Feb 2023 03:58:17 -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 S229501AbjBIL44 (ORCPT + 99 others); Thu, 9 Feb 2023 06:56:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229705AbjBIL4K (ORCPT ); Thu, 9 Feb 2023 06:56:10 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C7515BA70; Thu, 9 Feb 2023 03:46:28 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PCFSb6dxmz4f3jZY; Thu, 9 Feb 2023 19:46:23 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAn3rEQ3eRjgb0tDQ--.53508S3; Thu, 09 Feb 2023 19:46:26 +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 01/21] ext4: set goal start correctly in ext4_mb_normalize_request Date: Fri, 10 Feb 2023 03:48:05 +0800 Message-Id: <20230209194825.511043-2-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--.53508S3 X-Coremail-Antispam: 1UD129KBjvdXoWrtFyrAF13KFWrJr17AF43KFg_yoWkWwc_Ga 45ury8GFW5Jr1fCa1Syw1rtrs7KF48Xr17JrZrJ3WUX3WUuw4Ikwn0vr4xZa48Way7tay3 KrsIkr1xGa1S9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbf8YFVCjjxCrM7AC8VAFwI0_Gr0_Xr1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r18M28IrcIa0xkI8VCY1x0267AKxVWUXVWUCwA2ocxC64kI II0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7 xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2 z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4 xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v2 6r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwI xGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480 Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7 IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k2 6cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxV AFwI0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7IU0a0PDUUUUU== 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?1757354548480019684?= X-GMAIL-MSGID: =?utf-8?q?1757354548480019684?= We need to set ac_g_ex to notify the goal start used in ext4_mb_find_by_goal. Set ac_g_ex instead of ac_f_ex in ext4_mb_normalize_request. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 5b2ae37a8b80..0650a1dc870e 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4191,15 +4191,15 @@ ext4_mb_normalize_request(struct ext4_allocation_context *ac, if (ar->pright && (ar->lright == (start + size))) { /* merge to the right */ ext4_get_group_no_and_offset(ac->ac_sb, ar->pright - size, - &ac->ac_f_ex.fe_group, - &ac->ac_f_ex.fe_start); + &ac->ac_g_ex.fe_group, + &ac->ac_g_ex.fe_start); ac->ac_flags |= EXT4_MB_HINT_TRY_GOAL; } if (ar->pleft && (ar->lleft + 1 == start)) { /* merge to the left */ ext4_get_group_no_and_offset(ac->ac_sb, ar->pleft + 1, - &ac->ac_f_ex.fe_group, - &ac->ac_f_ex.fe_start); + &ac->ac_g_ex.fe_group, + &ac->ac_g_ex.fe_start); ac->ac_flags |= EXT4_MB_HINT_TRY_GOAL; } From patchwork Thu Feb 9 19:48:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54882 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp289055wrn; Thu, 9 Feb 2023 03:58:21 -0800 (PST) X-Google-Smtp-Source: AK7set9zziDSdBZLi/+rU6JnuJHVkzUXydgCu6glU20dkV2H9gUX9P1YrQT6jeap89FbfHs0h8y1 X-Received: by 2002:a17:902:e3d5:b0:199:5647:3342 with SMTP id r21-20020a170902e3d500b0019956473342mr2966775ple.33.1675943901120; Thu, 09 Feb 2023 03:58:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675943901; cv=none; d=google.com; s=arc-20160816; b=dMXjsb84YECJaUj86j4pXo3V+/lzW/FQOIbnmw15zXGXjECx3EVuZ8aOw8HT5Q4iVt kPedRS22Bx61M4ZFaDn3teSNrdqast6OTHYdG4aLBMnngeIFwGqiHVgb6+j4PUBHB29B yaCMd112NRsZ5VKE0kGl8qPK6qkGYtF7PvStO/p06Tl04IsxoRErBGgisQ2xhnHd+tUB t5G9ZmvHlFZ/4ZL0MYwiBtW687mD+CX1kuYFemxNj6TE6QyXdH0f2VvjUcfEn77jeG/Q yRz1lWlf86GDW3Qn6EY9ncAtcniDpYmM6bZMuc5NBfi+wpEG/kS0BxsXsBuxoCxY9gBs AByA== 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=aft6PkUwfkJsOFYeHPE+ZJRVZ+PBCJJOGq0TobtPubw=; b=ImbuEgkItyyeCJgZEkuuIyCJEXn0wQIJDWO15GnCq0pdf82V40cUXVFnWd4kuSeF1o KESLDJgQ8W2+3Ph2VhI0y9HIi/zn5wel23fwl24lpEav7M71Ovt6hkEsG6ovBJw3rWv1 UlJ3nlCeXtDQXVBSXXkm7KBKGIcYKlMVs3kvdMyaZpdGsCAW/C0mwNpqkyngBn/RkzlO chfqIzp7z9iWeR8nIBv8zECeU21eQN7SYMWjCSUuYHq8MwJWeuYGc5pO30ikIF9lbYVg XpmKW4errq0BhZOYtDhi4Ipo8U4/tZE/R5WuJ+VatUyNOoVup2FPoY8f47G6tWTSoXev NM2A== 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 k9-20020a170902c40900b001866341b823si1876240plk.322.2023.02.09.03.58.08; Thu, 09 Feb 2023 03:58:21 -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 S230122AbjBIL5C (ORCPT + 99 others); Thu, 9 Feb 2023 06:57:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229447AbjBIL4K (ORCPT ); Thu, 9 Feb 2023 06:56:10 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7AC4A5BA71; Thu, 9 Feb 2023 03:46:29 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PCFSc1YZnz4f3jpt; Thu, 9 Feb 2023 19:46:24 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAn3rEQ3eRjgb0tDQ--.53508S4; Thu, 09 Feb 2023 19:46:26 +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 02/21] ext4: allow to find by goal if EXT4_MB_HINT_GOAL_ONLY is set Date: Fri, 10 Feb 2023 03:48:06 +0800 Message-Id: <20230209194825.511043-3-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--.53508S4 X-Coremail-Antispam: 1UD129KBjvdXoWrury7ur4xtw1kZr4DtFW7twb_yoWDAwb_CF yUAr1xZ3Z5Jw1fC3WrAayFkF1vgF4Fqr4rWFWrXrZxZF4UX3WIya4qyr4fZwn2kw17A347 u34YgFy7Gr4IqjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbfxYFVCjjxCrM7AC8VAFwI0_Xr0_Wr1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r15M28IrcIa0xkI8VCY1x0267AKxVWUCVW8JwA2ocxC64kI II0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7 xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2 z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4 xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v2 6r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwI xGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480 Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7 IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k2 6cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxV AFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jTQ6JUUUUU= 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?1757354551999883235?= X-GMAIL-MSGID: =?utf-8?q?1757354551999883235?= If EXT4_MB_HINT_GOAL_ONLY is set, ext4_mb_regular_allocator will only allocate blocks from ext4_mb_find_by_goal. Allow to find by goal in ext4_mb_find_by_goal if EXT4_MB_HINT_GOAL_ONLY is set or allocation with EXT4_MB_HINT_GOAL_ONLY set will always fail. EXT4_MB_HINT_GOAL_ONLY is not used at all, so the problem is not found for now. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 0650a1dc870e..375d9655b525 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2162,7 +2162,7 @@ int ext4_mb_find_by_goal(struct ext4_allocation_context *ac, struct ext4_group_info *grp = ext4_get_group_info(ac->ac_sb, group); struct ext4_free_extent ex; - if (!(ac->ac_flags & EXT4_MB_HINT_TRY_GOAL)) + if (!(ac->ac_flags & (EXT4_MB_HINT_TRY_GOAL | EXT4_MB_HINT_GOAL_ONLY))) return 0; if (grp->bb_free == 0) return 0; From patchwork Thu Feb 9 19:48:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54889 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp289488wrn; Thu, 9 Feb 2023 03:59:12 -0800 (PST) X-Google-Smtp-Source: AK7set9stkk5Gsv8ss6NUhqMi1u0U2pMfbrvLbKaRJ3afazoXi9t4aLJghJX9koCP4+v6EANPKon X-Received: by 2002:a05:6a20:12d2:b0:be:b8bd:83ad with SMTP id v18-20020a056a2012d200b000beb8bd83admr13606411pzg.0.1675943952431; Thu, 09 Feb 2023 03:59:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675943952; cv=none; d=google.com; s=arc-20160816; b=0YR72Pi96P3BjLchf0R1HT0CXqqsghC9ZrS7RL7wW8/gKhRMHEx45pgMyZCy7f28jB PlUynUteRAytImXHUXZSgJWRYByu0lFmi4saWQNm6e0tvy07VUkv6JM4SNoS6+kAbCry dt57Kadp/e+jVgrQtEwowFh2DoMfjm8Zob/OhL9/bluHDJjFHBiC6tmp7VpS6RJg0zM3 k3BPONdaZXDKedAI6ffEnaqWqu5y9L5s11djTpVP3IxUmg3zRpRgbZTeu9ZuE9ZsvIVX D7jpmFxSBa3fGAwJ3WTjemQFmqTpi+qND48k3i1X63M23Ipqd2dTw1VVZeGyblUncPCv XRAQ== 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=q/obnqL0ND5KZyFMi04eWnGu9vKHcZPL8/rq04Qcu8A=; b=pXV0tMIjyKDKaduM7jfVayuBiOFdlKnw1X/6DLCO8GZJq24b30WdOiZGd0Raea/DY6 bzScHTNw6CoDCto49hXlLN6LTu1QEKfIKQaH4rxTBxDtLnzWQx0YF4XbyAxutu8d6XEw DxJFM0US84a0Xr8La0GstKVgZDk4c+3EOJGdzgDtjLE00CqzbpgoI8oV7AMRpkZawKsk cq5Wurs7+LtYh2f+R76nMHrVSvRQOyNVFDfibCq+LCzjyLHNKXkz3Q8cbqDoMwhsP9MI peaah9PGmwjYXS7xt+97H4g+5ETIt2Mp8Wv/kO1Fw45b/Ae5N2Zy/nDEmioC1vA1YJjm 7eVA== 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 w71-20020a63824a000000b004d058989ad7si118672pgd.255.2023.02.09.03.58.59; Thu, 09 Feb 2023 03:59:12 -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 S229951AbjBIL5H (ORCPT + 99 others); Thu, 9 Feb 2023 06:57:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229460AbjBIL4L (ORCPT ); Thu, 9 Feb 2023 06:56:11 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8281F5C481; Thu, 9 Feb 2023 03:46:29 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PCFSc4Kx3z4f3jLW; Thu, 9 Feb 2023 19:46:24 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAn3rEQ3eRjgb0tDQ--.53508S5; Thu, 09 Feb 2023 19:46:26 +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 03/21] ext4: avoid to use preallocated blocks if EXT4_MB_HINT_GOAL_ONLY is set Date: Fri, 10 Feb 2023 03:48:07 +0800 Message-Id: <20230209194825.511043-4-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--.53508S5 X-Coremail-Antispam: 1UD129KBjvdXoWrZFWkJry8trW3tF4UGw48WFg_yoWfJrbEka 4UZr48JayfJF1Ik3WFyrWxKr1IgF95Jr45WrZ5trWfZF1Uua92yw1kJrZ5ZrZrGw43A3sx Cw1UCFy8GrWSvjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbfxYFVCjjxCrM7AC8VAFwI0_Xr0_Wr1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r1rM28IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC64kI II0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7 xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2 z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4 xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v2 6r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwI xGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480 Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7 IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k2 6cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxV AFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jy0PhUUUUU= 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?1757354606279645563?= X-GMAIL-MSGID: =?utf-8?q?1757354606279645563?= ext4_mb_use_preallocated will ignore the demand to alloc at goal block only. Return false if EXT4_MB_HINT_GOAL_ONLY is set before use preallocated blocks in ext4_mb_use_preallocated. Signed-off-by: Kemeng Shi --- fs/ext4/mballoc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 375d9655b525..352ac9139fee 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4368,6 +4368,9 @@ ext4_mb_use_preallocated(struct ext4_allocation_context *ac) if (!(ac->ac_flags & EXT4_MB_HINT_DATA)) return false; + if (unlikely(ac->ac_flags & EXT4_MB_HINT_GOAL_ONLY)) + return false; + /* first, try per-file preallocation */ rcu_read_lock(); list_for_each_entry_rcu(pa, &ei->i_prealloc_list, pa_inode_list) { From patchwork Thu Feb 9 19:48:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54883 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp289104wrn; Thu, 9 Feb 2023 03:58:27 -0800 (PST) X-Google-Smtp-Source: AK7set8a594bf1R4+n1Dd3d8aSfkFUro3ajNk/ALjbgowt3Y7y785jZf0r/VLHUShQhe8mL0iI9v X-Received: by 2002:a05:6a21:6716:b0:bc:97d7:3cbb with SMTP id wh22-20020a056a21671600b000bc97d73cbbmr8360616pzb.15.1675943907345; Thu, 09 Feb 2023 03:58:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675943907; cv=none; d=google.com; s=arc-20160816; b=XMllVXIh2fj1a5HD0kHj3EPY/omX0f3Jj/XXhA0QVWraKGEji+0VO6DQIcyBq3ZI5l GSzpzZQ7HpUNtmjC9GbJcuRQSyPrGR2bLolCFanavFWYHlZcsYQ91BUl+MiLOOg/lpMs VaLXrswjwpU+PTu0BkFNw5dPPwR93pC22bCNK6JHrVoynQjvtWJvKQ8R/gqPdl5jwDod EbUXKSxQDHADthYpMJaK4a5+M+cdMwaw1sojMfHeEXrPTNWQ+3TqiHYSdhzuun5XEBX8 SnsbCCzWwQSQniRXAycILbKpvwex7pVQ7POztRIrB9B9MpnL5ang9yvm5U+EKD7jtf3/ FyFw== 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=0kI/iXwFU4vaWjcGn85CBndUXv5z6bkbvJyloapeG6s=; b=eomArYA41qt7qLWRjRoxmFOglk5q0w6JTYTFEMq05Jer961B0U4fKW8jFUWr8EQdo8 k+NgsMXtHd6b0h0Xd3y66RwHSjJHuFWhTvgIdTaFYELHmwC2UKJlM5WZ/KT7M5gT09+V rPbDFBt2/pdJEoG5ryqSfe6GvGjckpzToF5ru87s3dxlFgdH3ry4yxFpkBfsbx2cJ60i vUoAHHdcdDHwc3ArwygCakohJNVTVeu1FP6eYoh0dMWgSHsmI3VFit5NkT8Ci67Urujc x7JjuhfUHFOMxOWMKGAKArefZwJozYV4CnyAqTyeZKzE7bO68SNrcxAYIIntk+mWtTNR qpSQ== 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 u123-20020a637981000000b004e8529ae3eesi1827848pgc.294.2023.02.09.03.58.13; Thu, 09 Feb 2023 03:58:27 -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 S229831AbjBIL5J (ORCPT + 99 others); Thu, 9 Feb 2023 06:57:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229519AbjBIL4L (ORCPT ); Thu, 9 Feb 2023 06:56:11 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8DAAB5C482; Thu, 9 Feb 2023 03:46:29 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PCFSc6TkGz4f3jLm; Thu, 9 Feb 2023 19:46:24 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAn3rEQ3eRjgb0tDQ--.53508S6; Thu, 09 Feb 2023 19:46:26 +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 04/21] ext4: get correct ext4_group_info in ext4_mb_prefetch_fini Date: Fri, 10 Feb 2023 03:48:08 +0800 Message-Id: <20230209194825.511043-5-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--.53508S6 X-Coremail-Antispam: 1UD129KBjvdXoW7Jr15AF4Dtw4rtw13uFW8Xrb_yoWDtFc_ta 4xAr1fGryrJw1xKr4Sgrn0ya1UtFs5Jr1UXFWftr1fuF4UJw45ZFykAr47Ar17ua93tFZx tr9xJFyxJFn2gjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbS8YFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7 CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jyYLPUUUUU= 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?1757354558363287407?= X-GMAIL-MSGID: =?utf-8?q?1757354558363287407?= We always get ext4_group_desc with group + 1 and ext4_group_info with group to check if we need do initialize ext4_group_info for the group. Just get ext4_group_desc with group for ext4_group_info initialization check. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 352ac9139fee..f24f80ecf318 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2570,13 +2570,13 @@ void ext4_mb_prefetch_fini(struct super_block *sb, ext4_group_t group, unsigned int nr) { while (nr-- > 0) { - struct ext4_group_desc *gdp = ext4_get_group_desc(sb, group, - NULL); - struct ext4_group_info *grp = ext4_get_group_info(sb, group); + struct ext4_group_desc *gdp; + struct ext4_group_info *grp; if (!group) group = ext4_get_groups_count(sb); group--; + gdp = ext4_get_group_desc(sb, group, NULL); grp = ext4_get_group_info(sb, group); if (EXT4_MB_GRP_NEED_INIT(grp) && From patchwork Thu Feb 9 19:48:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54884 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp289117wrn; Thu, 9 Feb 2023 03:58:28 -0800 (PST) X-Google-Smtp-Source: AK7set+Ju/lVyRTg1b+1WdjZ4Vrc/A4WQzhHQkOwGOKOYpBsb2wL0LO/ruLtt50ZLRzaGx4qPIZr X-Received: by 2002:a17:90b:1d05:b0:232:d0e2:2868 with SMTP id on5-20020a17090b1d0500b00232d0e22868mr1779531pjb.18.1675943908405; Thu, 09 Feb 2023 03:58:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675943908; cv=none; d=google.com; s=arc-20160816; b=qnTKsOxqOEaesatojsWvlbtzCSRd46xkcDtwL6hQjV1PjrEP2VyiF57tN0UwLlRTxo +jUvFIsgHLr4Lqwokfct7Gl65z3XXPwDSvOOqaspSHu3NmlemV+BIhvBEym0g0+tink0 4XA1MLM9mDlf135gKWKxPv+1qdsE8AFGcEO3NrJSVBtEg1b/0TYppg+Q33OH4IJtXiEg MVdloM7sK15U0OcaqhxOcLCz1cch7/+AL9rzaKsoZ0jAtuGHz/pll/E0cUTEAJ9k+WgO fMkx74UG31SbhiE3Nbx9MAMdlQkZB6mbVFoqMOAOek40kEhGOyLi0AfCtY4xa+hWuquR p7MQ== 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=eAK1uYMG0gMmHVhKho3OBjcbV9nwemgunTAe5qjzE1Q=; b=LXQokV0dvbisEiM3WK617O8DoMearW9YQJkx8BDPjp62ERMKQLA2bd0PDD1tWtUV28 ikO3GqKwsKMHkNrmritFD3twF4MOYYsNNITCIPTGieE1BOATQxNwSPweADLQR5HDg/tA keOtx07/tbqcRFsMAtjKda2RoRMJNooWFLFOj/pFk1nAPa1LdwBuUj5MQiyw5jQZsKfe jhThs3ziGBEzEAcWpVDFqlEXwj4DyNHjahIGO5m9jVyKDTQAhdesl6AVjysmX8ueuNBe IJdbQBGG/WRn1+OVFj14cGXPvh+0WeRyicTwbRbLS/l18v0X7InBuDc1mj/EAL2zt/MR tG4w== 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 ce21-20020a17090aff1500b00231041254cdsi1738936pjb.31.2023.02.09.03.58.15; Thu, 09 Feb 2023 03:58:28 -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 S230037AbjBIL5P (ORCPT + 99 others); Thu, 9 Feb 2023 06:57:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229530AbjBIL4M (ORCPT ); Thu, 9 Feb 2023 06:56:12 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB2E85C487; Thu, 9 Feb 2023 03:46:29 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PCFSd1Ny2z4f3jpv; Thu, 9 Feb 2023 19:46:25 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAn3rEQ3eRjgb0tDQ--.53508S7; Thu, 09 Feb 2023 19:46:27 +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 05/21] ext4: correct calculation of s_mb_preallocated Date: Fri, 10 Feb 2023 03:48:09 +0800 Message-Id: <20230209194825.511043-6-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--.53508S7 X-Coremail-Antispam: 1UD129KBjvJXoW7ZFWDCFykAw4kJF4rCw4Durg_yoW8JF4xpF sxKr1UGwn3urn0kaykW3Z8Wwn7Ka1xKr45GryIgr48ZFZrJryakF4qyrW8WF1SvrWkZFnI vFW29FyUCrWI937anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB2b4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3w A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6x kF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUIL05UUUUU 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?1757354560052971855?= X-GMAIL-MSGID: =?utf-8?q?1757354560052971855?= We will add pa_free to s_mb_preallocated when new ext4_prealloc_space is created. In ext4_mb_new_inode_pa, we will call ext4_mb_use_inode_pa before adding pa_free to s_mb_preallocated. However, ext4_mb_use_inode_pa will consume pa_free for block allocation which triggerred the creation of ext4_prealloc_space. Add pa_free to s_mb_preallocated before ext4_mb_use_inode_pa to correct calculation of s_mb_preallocated. There is no such problem in ext4_mb_new_group_pa as pa_free of group pa is consumed in ext4_mb_release_context instead of ext4_mb_use_group_pa. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index f24f80ecf318..2bffc93778d5 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4670,8 +4670,8 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) pa->pa_len, pa->pa_lstart); trace_ext4_mb_new_inode_pa(ac, pa); - ext4_mb_use_inode_pa(ac, pa); atomic_add(pa->pa_free, &sbi->s_mb_preallocated); + ext4_mb_use_inode_pa(ac, pa); ei = EXT4_I(ac->ac_inode); grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group); From patchwork Thu Feb 9 19:48:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54885 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp289158wrn; Thu, 9 Feb 2023 03:58:33 -0800 (PST) X-Google-Smtp-Source: AK7set+/RKnbp6UbNxyzOaWFZWbVAsTAjAddeG1LA+H7sJbHCFA+rMnV2KrcVTearmGk0caxbbNC X-Received: by 2002:a17:902:ea01:b0:199:4362:93f2 with SMTP id s1-20020a170902ea0100b00199436293f2mr8182545plg.65.1675943913263; Thu, 09 Feb 2023 03:58:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675943913; cv=none; d=google.com; s=arc-20160816; b=bKC8w/cXau19zzNaTAZRCm+6yi5a9aUGKvSNUsBvitZ5ouw5w1r9kEXE42uN74xmWC 8Liiu3G+7FkrYH1uaPWXzUUnN/OLDNwsDhhQh7VyzFC776TxdaJ5OOgxpU8e/CnExu/N ikZkWanas8lHvuk5wxV+JrFSDRvqgI5e7sV7ZhrgvERqGxqOYyiARMz1EXoR+Kusrjn9 KFr95zEteBODTgyPE73vInwsgKOT52vi9AJFUPRIzDGguk5LR9w9G3lHID4WtqPcNLSz 7S/32snYd87r7HUcnhhitSsJTDiIn8pGyyxKtE0KqPT0c4ByUTyJKQYYOswQiqJevlAY toHA== 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=sp6ekCMArpGcUzWmRq9YBzlyj2nx6VCG73xgZ8OPuLw=; b=OszHkWi3vndt8Oz5Yf/fxi/a/f8SLaueq8zf/gr4lPUa9I4V3qatdwIVuJ4PtpJBpD +AaAmkqb+xrygCiya90yqhA92VW3yH5GaO4vPoLliRLcNS2PtY/nQ6Z8g7SX0PN9UJ4x rO2x+F0TijJZtJoGnWghjeSiAva+DTAPiKkHrdoY9F9kWzJg/R4DgQ9XEZkMvGu5Zi+f gZHqmUs9zAN1HBs9FCpRTHcHnIzcIxUe0Xg2EmbvpWhhG8FJkVKdpj5Wouq77pIe2Ki6 XTqOqxLf92iGrx5uj+Bua1kp3Ji5JJqJhsw7k55+fmVzN19l+lIcbzfwngcIU4fOuhU8 n00A== 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 o5-20020a170902d4c500b00177568a0e53si1684535plg.252.2023.02.09.03.58.19; Thu, 09 Feb 2023 03:58:33 -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 S230218AbjBIL50 (ORCPT + 99 others); Thu, 9 Feb 2023 06:57:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229606AbjBIL4M (ORCPT ); Thu, 9 Feb 2023 06:56:12 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 886A35C48A; Thu, 9 Feb 2023 03:46:30 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PCFSd2ZDLz4f3mJv; Thu, 9 Feb 2023 19:46:25 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAn3rEQ3eRjgb0tDQ--.53508S8; Thu, 09 Feb 2023 19:46:27 +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 06/21] ext4: correct start of used group pa for debug in ext4_mb_use_group_pa Date: Fri, 10 Feb 2023 03:48:10 +0800 Message-Id: <20230209194825.511043-7-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--.53508S8 X-Coremail-Antispam: 1UD129KBjvdXoW7JF15JFyUXFWUCryrZry7KFg_yoWxZFX_Ka 40yrZ7Wa4fJ3sa93ZYyr4Sqa1SgFs5AF1UXFs5Jr45u3WrWF4xK34Durs5JFW5W3y2vry7 X3Z3ZryUtFySvjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbS8YFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7 CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jstxDUUUUU= 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?1757354564621019413?= X-GMAIL-MSGID: =?utf-8?q?1757354564621019413?= As we don't correct pa_lstart here, so there is no need to subtract pa_lstart with consumed len. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 2bffc93778d5..433337ac8da2 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4319,7 +4319,7 @@ static void ext4_mb_use_group_pa(struct ext4_allocation_context *ac, * Other CPUs are prevented from allocating from this pa by lg_mutex */ mb_debug(ac->ac_sb, "use %u/%u from group pa %p\n", - pa->pa_lstart-len, len, pa); + pa->pa_lstart, len, pa); } /* From patchwork Thu Feb 9 19:48:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54888 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp289298wrn; Thu, 9 Feb 2023 03:58:49 -0800 (PST) X-Google-Smtp-Source: AK7set9pmJps63Y+OLo4iPG8TwYgqeikFI0n+jk0QassKqDfBNMUi1JeeCetlZq6/U+AeyoRr8u4 X-Received: by 2002:a17:90b:1b01:b0:231:405:3365 with SMTP id nu1-20020a17090b1b0100b0023104053365mr8154700pjb.20.1675943929233; Thu, 09 Feb 2023 03:58:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675943929; cv=none; d=google.com; s=arc-20160816; b=z9vwvIacBUj+pNA/U20fpFI/XhXbcppNKt7MJV11UsTcutsTQ6I8JczNVJ2PuB8h8O XgWp0ryc0JS9PwgqQdqTs4jilXOKgN/44e9CEb4GqW0AZLVDlacFVuoa6bdxPbD5aVHp u77jGmr1ga08X9YNukZ65co5J6cXUsj6yXfwPZmQnUtDwvH3SVysgjD/iMVGwFRzuUNt ybWAfolxbQ3PUKXo6I2sUFAPjZRx0NYQvaghV7TSqVIgAwbotfIeJ9z775+3hfHUG1Dl /qW43wpPx67Kxi5Y57zHNL4ZABhpiopMS31UHcKv5DDS70/u82x+1LUR1OLOrNCE9xQ9 VTYg== 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=MwUe1WzShvA7mknTw4d6CO6EXB5zXpRiWPfYUVeZuWE=; b=kZSHnUkBvHh8pheovGtMaFtjFQh1NJUX7ZhZqrJyEb7gEUrr9KPxVUMRyaE2aCCBd6 qRydJU5pHfNSzs7iHG3WUAeBnNcpc2WswoBSt8VCjbRxnjs7ShtyijXrmqiqLncsvcv0 zgLhLT5+yg/BluPMWU7P5i/l59MjMyFKpkY4ZssAXwsWafS0Ox0ROvvbcJbrT65sRGyT 0XM/XwXx/LblyKz0/o+kTOAVRtitlAJRPl+DaX9+nz6EcQnAxxXDTIhpUQqYUDnInyEc 4pL33KqJh8VDgfBscpV4WBuUOz5n9qULogboBxJws1an6qZ6eW+wcMYofBCXHgNItHqS Vmfw== 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 t14-20020a63b70e000000b004dc05ba4699si1649290pgf.417.2023.02.09.03.58.30; Thu, 09 Feb 2023 03:58:49 -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 S230074AbjBIL5V (ORCPT + 99 others); Thu, 9 Feb 2023 06:57:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229588AbjBIL4M (ORCPT ); Thu, 9 Feb 2023 06:56:12 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86C5B5C488; Thu, 9 Feb 2023 03:46:30 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PCFSd6933z4f3m7P; Thu, 9 Feb 2023 19:46:25 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAn3rEQ3eRjgb0tDQ--.53508S9; Thu, 09 Feb 2023 19:46:27 +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 07/21] ext4: protect pa->pa_free in ext4_discard_allocated_blocks Date: Fri, 10 Feb 2023 03:48:11 +0800 Message-Id: <20230209194825.511043-8-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--.53508S9 X-Coremail-Antispam: 1UD129KBjvdXoW7Gr1UGF18KFyDJryxXF47Arb_yoW3ArXEka 48AF4xJFWrJa4S93W8tay0qr4rKF4Syr4UWFWrtr43ua1rXF4fG3WDXr1rJrZxWa12y3y7 C3sY9ryUGanagjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbS8YFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7 CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jstxDUUUUU= 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?1757354581560164063?= X-GMAIL-MSGID: =?utf-8?q?1757354581560164063?= If ext4_mb_mark_diskspace_used fails in ext4_mb_new_blocks, we may discard pa already in list. Protect pa with pa_lock to avoid race. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 433337ac8da2..4e1caac74b44 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4263,8 +4263,11 @@ static void ext4_discard_allocated_blocks(struct ext4_allocation_context *ac) ext4_mb_unload_buddy(&e4b); return; } - if (pa->pa_type == MB_INODE_PA) + if (pa->pa_type == MB_INODE_PA) { + spin_lock(&pa->pa_lock); pa->pa_free += ac->ac_b_ex.fe_len; + spin_unlock(&pa->pa_lock); + } } /* From patchwork Thu Feb 9 19:48:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54891 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp289623wrn; Thu, 9 Feb 2023 03:59:33 -0800 (PST) X-Google-Smtp-Source: AK7set+JATbsKSyG5eTx9ZlMMf7zs4M9Js1kZ+aWxZ5ysx6MPfhBOJVrwU2IUrWzGwyCcwvPbaXw X-Received: by 2002:a05:6a21:30c3:b0:bc:42f9:6b21 with SMTP id yf3-20020a056a2130c300b000bc42f96b21mr7865483pzb.15.1675943973230; Thu, 09 Feb 2023 03:59:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675943973; cv=none; d=google.com; s=arc-20160816; b=Iq2m5lyPREMM+llhJdk7K/KUo/tLvF/YqkbVT7YBFQawB2rVBIon04JCurNtntfj3g 9FS0gnYHN0uJPirkIVZW3U5TCC/N7Sp9ILy46bpoZ67o1hoGIbSz7rBEohNI9OZTFE4c 4UlnZG9JcsUxn0q1/1XeKC1v1k57lcuczjdM8nnkbx9F7m2u98yDxk4XNIDQrzG5js1b +pTE25Em4l7EL2iB2c3XQe14d0UHaC/5Gr/qsvcoAXiXB7K0/IyVUhfTJy9X+fAXY+xd 1suKYlBjAqsZTpMcg0skYx9WLHDU9dXEvzwmYcG8IEY4d6NYUL0J2qOn5Zgqe7v9F9Iq RJ/g== 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=OXoyt/wuMq+VxHd3fHJDJj1MfaWFN05o72evFTtum1M=; b=MgtsCeGzyon+ijeyYGi6s0I+NKJtro/IgtSU2CKjE1iyzoV3e2ol9y+frsYlyxiP15 TD29K0yO4XIOsiAPV1Ew0vH4Phtf6yjsoE4U9FsbPa0esVtXyEtlWnDoJpXsx5Qb8ysQ qkuy8NWL63Uhb/LoH42shP3LsAZonQwXQywBsbGzcljJCfgtnaWek8a62LXgXw9PWkUA YfbKtHhkEC8DRUZW0WbBPRp5qWYYNeiNElq2PpaXZvcdtahJXdCeeWgA5i5yoR0m200e qz5d+3vDJt832lUsAjcrNwIKwt9BnXkb5X9egg6HZJQtb0s0K1mW117t91FisDMpsSUj 2XtA== 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 m22-20020a637116000000b004fb37497be2si1765011pgc.642.2023.02.09.03.59.21; Thu, 09 Feb 2023 03:59:33 -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 S230239AbjBIL5b (ORCPT + 99 others); Thu, 9 Feb 2023 06:57:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229608AbjBIL4N (ORCPT ); Thu, 9 Feb 2023 06:56:13 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 249045C48C; Thu, 9 Feb 2023 03:46:31 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PCFSd6q5Xz4f3v6t; Thu, 9 Feb 2023 19:46:25 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAn3rEQ3eRjgb0tDQ--.53508S10; Thu, 09 Feb 2023 19:46:28 +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 08/21] ext4: add missed brelse in ext4_free_blocks_simple Date: Fri, 10 Feb 2023 03:48:12 +0800 Message-Id: <20230209194825.511043-9-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--.53508S10 X-Coremail-Antispam: 1UD129KBjvJXoW7Ary8Xr1ktw4fGF17ZryfXrb_yoW8XFWkpr 4qyF48GFn3Wr1qgF4xX34UX3W8twn7W3WUGFWrGwnrCrW3J3saqFs7KF1F93W5KFZ3AanI vFn093yrJF4jgFUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB2b4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3w A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6x kF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUIL05UUUUU 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?1757354627516610826?= X-GMAIL-MSGID: =?utf-8?q?1757354627516610826?= Release bitmap buffer_head we got if error occurs. Besides, this patch remove unused assignment to err. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 4e1caac74b44..17ac98c501ed 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5848,13 +5848,12 @@ static void ext4_free_blocks_simple(struct inode *inode, ext4_fsblk_t block, ext4_get_group_no_and_offset(sb, block, &group, &blkoff); bitmap_bh = ext4_read_block_bitmap(sb, group); if (IS_ERR(bitmap_bh)) { - err = PTR_ERR(bitmap_bh); pr_warn("Failed to read block bitmap\n"); return; } gdp = ext4_get_group_desc(sb, group, &gdp_bh); if (!gdp) - return; + goto err_out; for (i = 0; i < count; i++) { if (!mb_test_bit(blkoff + i, bitmap_bh->b_data)) @@ -5863,7 +5862,7 @@ static void ext4_free_blocks_simple(struct inode *inode, ext4_fsblk_t block, mb_clear_bits(bitmap_bh->b_data, blkoff, count); err = ext4_handle_dirty_metadata(NULL, NULL, bitmap_bh); if (err) - return; + goto err_out; ext4_free_group_clusters_set( sb, gdp, ext4_free_group_clusters(sb, gdp) + count - already_freed); @@ -5872,6 +5871,8 @@ static void ext4_free_blocks_simple(struct inode *inode, ext4_fsblk_t block, ext4_handle_dirty_metadata(NULL, NULL, gdp_bh); sync_dirty_buffer(bitmap_bh); sync_dirty_buffer(gdp_bh); + +err_out: brelse(bitmap_bh); } From patchwork Thu Feb 9 19:48:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54892 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp289627wrn; Thu, 9 Feb 2023 03:59:33 -0800 (PST) X-Google-Smtp-Source: AK7set/tXgwUubodnBswRxMDC0IufMhOa9ShIxZ6/RkINCoOXZ+v63Am2v9kxHRswSOvDQpcRrae X-Received: by 2002:a17:90a:1994:b0:231:2697:5cef with SMTP id 20-20020a17090a199400b0023126975cefmr3599226pji.42.1675943973529; Thu, 09 Feb 2023 03:59:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675943973; cv=none; d=google.com; s=arc-20160816; b=N2uawYNNGjck2duMTHyUnVRE1/upoQGhc5BAEEyP8PFHGMNa3/JcFMcAjig20JsUPC aFJBwaHnwKfHDop6PnoVp8gc/+R28ZPA/3TEuz7zAcyHnmEmzqvcoSuqDmjZSKljgBsi zmhlygjYUjrviPzo2WISofPLMXqs5nh9dcXGnHiyVKbe0xX4KNrY6xgwbluL6ZpW0pxC I0CsrEUueIPhtt1GbNiFvazNOLwNyIjD/e+ooRgeLOF6AxGABByZcYNwt7V88jNNKiGd gv6JfbcnZTFFXE9E5hzWRhkTiwKAl1Djuu+wOBfcCCJpr4F44BCNw3NP2fO67uDJvgZD NgQA== 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=SX9Vdr+VGSvAnanSph5nclb2l5A73T+NPpoJL3LGgHw=; b=WiuA7MLhWVSa0vjMt1D8HlgXB5PzeYsuOWkwDMBMb5KDt1Pq9DJovYdCB1g6FFP72B AHKhB/lnqqhuKNZD8iaE4EvtzGcqrgc4OsWTNn9Feww/jsvjvMwDI3ISeuaqtvkdavFc KlBxlmJ6ZgT0i7PcWwQl9VXLDbJtCj+Cn0sgPgqXSRfXvcBKEZH7jqBjXGZ42DkjoQE0 BCkCV6RNnUDm1gHmV7KolUv+MzoOSG/mLjFZSQY618cDa/E+PY/DKD6vLoNyVZjafDDv 1Aq7RVwsOEo7w00Uj8/t8CX8qiCzSE/1ITbawTn1WXUKTuOt5mwvFZ9EwKpYjGCIQWd+ X6Yw== 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 v24-20020a17090a899800b00230a5b372b7si4905973pjn.106.2023.02.09.03.59.21; Thu, 09 Feb 2023 03:59:33 -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 S230258AbjBIL5e (ORCPT + 99 others); Thu, 9 Feb 2023 06:57:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229564AbjBIL4N (ORCPT ); Thu, 9 Feb 2023 06:56:13 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 320C85C48F; Thu, 9 Feb 2023 03:46:31 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PCFSf1xcwz4f3v6x; Thu, 9 Feb 2023 19:46:26 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAn3rEQ3eRjgb0tDQ--.53508S11; Thu, 09 Feb 2023 19:46:28 +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 09/21] ext4: remove unused return value of ext4_mb_try_best_found and ext4_mb_free_metadata Date: Fri, 10 Feb 2023 03:48:13 +0800 Message-Id: <20230209194825.511043-10-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--.53508S11 X-Coremail-Antispam: 1UD129KBjvJXoWxJrWUZFWxZFW8KrWkZrWUJwb_yoW8uFyfpr srJFy8Cr1xXr1DuFZru3W5X3WF9w4xu3WUGryIgw1rCF13urWDKF47t3W0vF1FqrWkuFnx AFWqvr15GrsrK37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB2b4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3w A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6x kF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUIL05UUUUU 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?1757354628120181276?= X-GMAIL-MSGID: =?utf-8?q?1757354628120181276?= Return value static function ext4_mb_try_best_found and ext4_mb_free_metadata is not used. Just remove unused return value. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 17ac98c501ed..ad9e3b7d3198 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2124,7 +2124,7 @@ static void ext4_mb_measure_extent(struct ext4_allocation_context *ac, } static noinline_for_stack -int ext4_mb_try_best_found(struct ext4_allocation_context *ac, +void ext4_mb_try_best_found(struct ext4_allocation_context *ac, struct ext4_buddy *e4b) { struct ext4_free_extent ex = ac->ac_b_ex; @@ -2135,7 +2135,7 @@ int ext4_mb_try_best_found(struct ext4_allocation_context *ac, BUG_ON(ex.fe_len <= 0); err = ext4_mb_load_buddy(ac->ac_sb, group, e4b); if (err) - return err; + return; ext4_lock_group(ac->ac_sb, group); max = mb_find_extent(e4b, ex.fe_start, ex.fe_len, &ex); @@ -2147,8 +2147,6 @@ int ext4_mb_try_best_found(struct ext4_allocation_context *ac, ext4_unlock_group(ac->ac_sb, group); ext4_mb_unload_buddy(e4b); - - return 0; } static noinline_for_stack @@ -5699,7 +5697,7 @@ static void ext4_try_merge_freed_extent(struct ext4_sb_info *sbi, kmem_cache_free(ext4_free_data_cachep, entry); } -static noinline_for_stack int +static noinline_for_stack void ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b, struct ext4_free_data *new_entry) { @@ -5742,7 +5740,7 @@ ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b, EXT4_C2B(sbi, cluster), "Block already on to-be-freed list"); kmem_cache_free(ext4_free_data_cachep, new_entry); - return 0; + return; } } @@ -5768,7 +5766,6 @@ ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b, list_add_tail(&new_entry->efd_list, &sbi->s_freed_data_list); sbi->s_mb_free_pending += clusters; spin_unlock(&sbi->s_md_lock); - return 0; } /* From patchwork Thu Feb 9 19:48:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54886 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp289248wrn; Thu, 9 Feb 2023 03:58:45 -0800 (PST) X-Google-Smtp-Source: AK7set/rA9WdfjHG19abRM+JiJjAyWDvAHKx0U7o99FzxwBjvfl9XDMF5bYocgLRtSZe4aWNn7qf X-Received: by 2002:a05:6a21:3292:b0:be:b04d:1c29 with SMTP id yt18-20020a056a21329200b000beb04d1c29mr15314435pzb.5.1675943925070; Thu, 09 Feb 2023 03:58:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675943925; cv=none; d=google.com; s=arc-20160816; b=IMMcyEDuH4UnwFZQ6sFX46KsdOYD5MCHpuyOMx21zFvxDy2az6S1iMaI90/kpkEX71 kCjdZG4qp9+crW7dKiLU40xfAMk4jwR9kXgP5wvuu1rGLLfU7G5mwNg1bS0abDW3rWOi OJJNl9Wd2i/JqpryllFAiCxYkGewaG7cbJhcKaskgwai3M90d4BxqTNAfVOQ4EKySD6T WQavfNkOnnA538/kH1gmcOgnh2LwYwKoMe4fYKEUCvCq0f0815gxTDUO5Ynd6Hxf2BYh OlOZRRhTYu8ShJcI0nIWXcyP6TBfBxWMFbFBX0ROJLx7fACD9uOuM8uGqb0HlwxcpJ9e VqSw== 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=EsrpeDUiLds92L5fOSHo77770Czoyb+PEJIoWegNyKs=; b=rftLi+BCnfpDf3BVMxONa8puHMNUeQ5Cep8uTHA2MLzuH33k1wPnYD73FlMYcE99qq CxOQ7uvMekx492+vtHeDSqaFthojg51T6xavEASfRCc81b1vnHdAeXvf8Vrn8Me60VV4 pNjnYxdkujRgkxr1cw7oLCGzUPP09CpnT3ssHczqZCEsrtYdsV46qnWOaOvUZBlPSdI9 /8piMd6HyAZJOI3nJNLiGV8T5BYSQnZy0fsaIO/mdVHTBouwsblU+5XI3MSU2sS5OaGG IoWdLadzczkx++L7cFTqMEWtWx444dormgdeFOptK7W5vjPjMf7Yxzs2wtzR9pEPFAR/ HFYA== 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 lk4-20020a17090b33c400b0022932e92038si4133702pjb.130.2023.02.09.03.58.27; Thu, 09 Feb 2023 03:58:45 -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 S230264AbjBIL5m (ORCPT + 99 others); Thu, 9 Feb 2023 06:57:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229520AbjBIL4O (ORCPT ); Thu, 9 Feb 2023 06:56:14 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A16B35C490; Thu, 9 Feb 2023 03:46:31 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PCFSf5GqPz4f3nTJ; Thu, 9 Feb 2023 19:46:26 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAn3rEQ3eRjgb0tDQ--.53508S12; Thu, 09 Feb 2023 19:46:28 +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 10/21] ext4: Remove unnecessary release when memory allocation failed in ext4_mb_init_cache Date: Fri, 10 Feb 2023 03:48:14 +0800 Message-Id: <20230209194825.511043-11-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--.53508S12 X-Coremail-Antispam: 1UD129KBjvdXoW7Jw1rKw1DWrWUWF4DWFW7Arb_yoWxKFb_Ga 4vvrW8X34rJ3WIy3W0yw1rtFyqqa95AF48XrZxtrZxuF15Ww4fCw1kJrs5AwnrW3Wavr98 urn3AryrGF40yjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbSxYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6x kF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUIL05UUUUU 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?1757354577044881531?= X-GMAIL-MSGID: =?utf-8?q?1757354577044881531?= If we alloc array of buffer_head failed, there is no resource need to be freed and we can simpily return error. 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 ad9e3b7d3198..15fc7105becc 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -1168,10 +1168,8 @@ static int ext4_mb_init_cache(struct page *page, char *incore, gfp_t gfp) if (groups_per_page > 1) { i = sizeof(struct buffer_head *) * groups_per_page; bh = kzalloc(i, gfp); - if (bh == NULL) { - err = -ENOMEM; - goto out; - } + if (bh == NULL) + return -ENOMEM; } else bh = &bhs; From patchwork Thu Feb 9 19:48:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54887 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp289297wrn; Thu, 9 Feb 2023 03:58:49 -0800 (PST) X-Google-Smtp-Source: AK7set9CJO6tdl3CGt2h2NhD/nuHjEuKWCwmEdMq+ZwkZWxQqJrQZqKVlPCxY/nzw7xSlkXeDi3c X-Received: by 2002:a05:6a20:1e43:b0:bc:5a6:1b2a with SMTP id cy3-20020a056a201e4300b000bc05a61b2amr10082480pzb.49.1675943929229; Thu, 09 Feb 2023 03:58:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675943929; cv=none; d=google.com; s=arc-20160816; b=k/zarRJ+ZC1vBTsmBi2Lm0/uyKxMuzOAJJFGQd9NCe2Kd+JUv1kYEVp1DMsurYpu2y aCOOaKoG23KaLVqMh+Q7q7kJWrbpZTpm5dulkg4cYrd9jmV92EOzIpWGfWtzZ9tghJu2 qCsu8koTFZU+Wixukm9ewlRl22Nu++4ez8T/UBy35FXNbJbErhTga9YVouspZA9t4QrE tL/5xpj4PpKgHY7PVm04JsgQGSXYIexmNl19bBps5d0D4ov7UcWQ/QjuBNjpVvmjn2eK azqdPAUazLcs8FB3l8Qj9O7ARFMT1+sdP78aRYGPpbbD4gEbzhKGHN72ygMv5JW02Hg2 ALlw== 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=51kPPZA1gVrmw7VQVo7EeNrAgCsOSRoMk6BixNs2KQM=; b=u1jejU9WVHhBuKrGRtUJlU7xV6kWuEJeCBz+X4DOMWEA4iXSZhn1EB1t6oV+CX638q aWGfFJry4bJXc70CecDBE3OOqofdrEyD+Np53Axv8sxdM6u1l7W4zjMZob+xRh0rJdAP /pxa+q+trp+jLcI+C/UHJziGUkg3pYcmC+2V5efsipbwB73aQzQExLZuNthku8X/XuIZ fcFz/1rhgABqm/VZptP9R42YlYpYIvG55t//dsZhZpzjyxVTGG4O4lNzHCoZH3VIzA2b VSGViLZXeH5GHq3nxSHeWz877Ub53zaEgNC1CmfU5Ny/6458ZnpPotGweXvw0bcbBmYL RQ8g== 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 d6-20020aa797a6000000b00593e5a07bf3si1554552pfq.253.2023.02.09.03.58.31; Thu, 09 Feb 2023 03:58:49 -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 S230323AbjBIL5r (ORCPT + 99 others); Thu, 9 Feb 2023 06:57:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229761AbjBIL4O (ORCPT ); Thu, 9 Feb 2023 06:56:14 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF38F5C495; Thu, 9 Feb 2023 03:46:31 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PCFSf6FNhz4f3v75; Thu, 9 Feb 2023 19:46:26 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAn3rEQ3eRjgb0tDQ--.53508S13; Thu, 09 Feb 2023 19:46:29 +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 11/21] ext4: remove unnecessary e4b->bd_buddy_page check in ext4_mb_load_buddy_gfp Date: Fri, 10 Feb 2023 03:48:15 +0800 Message-Id: <20230209194825.511043-12-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--.53508S13 X-Coremail-Antispam: 1UD129KBjvdXoWrZr1rGF1Uuw1xKw13Cry7GFg_yoW3Arc_Ga 4I9r48tr4rJryqkF1xZwsIyws8KanY9rWUXFZ3tryUZFyUZrWDZw1kZr1Fya1xuFy29rW5 CF13ZF9rJFW09jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbSxYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6x kF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUIL05UUUUU 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?1757354581376066524?= X-GMAIL-MSGID: =?utf-8?q?1757354581376066524?= e4b->bd_buddy_page is only set if we initialize ext4_buddy successfully. So e4b->bd_buddy_page is always NULL in error handle branch. Just remove the dead check. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 15fc7105becc..74da24c9bf14 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -1555,8 +1555,7 @@ ext4_mb_load_buddy_gfp(struct super_block *sb, ext4_group_t group, put_page(page); if (e4b->bd_bitmap_page) put_page(e4b->bd_bitmap_page); - if (e4b->bd_buddy_page) - put_page(e4b->bd_buddy_page); + e4b->bd_buddy = NULL; e4b->bd_bitmap = NULL; return ret; From patchwork Thu Feb 9 19:48:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54895 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp290466wrn; Thu, 9 Feb 2023 04:00:58 -0800 (PST) X-Google-Smtp-Source: AK7set/T2LhJZ5zuxBkKwl+UW0yIUol+P8SPR0944BH0pZEmG+nC8GfmGgyCBj44/aW2OuKSZnBO X-Received: by 2002:a17:90a:1918:b0:22c:4b18:4ebb with SMTP id 24-20020a17090a191800b0022c4b184ebbmr5270576pjg.29.1675944058306; Thu, 09 Feb 2023 04:00:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675944058; cv=none; d=google.com; s=arc-20160816; b=wzVwTlDubPkCat6beCeaXABR8tN3wg2bmDe4l0HzN64sXsfxFg1AFEg/IL3AKSD7N0 wkDt5XfcWN5iE5hvu0FRxOWDdWTHXBM4itk9VlaESr2lygIxX9zV1TD59uO6V7aDT4tY 3/VhAsv/qbRNLJlPgxliwSb6dVHQjWajA4jmxCsyssB3WQawhrVbw0TFEYKQH7zGrZbf nRDtxM+a+3GFh5k67v6RMtYT/fdkiveRxC6O6KPCkCi3MTd+/dt2Av2aN+QHbzpIadeU GcbRISsg7pDLXlB/2dqIgDyr5KyY5U+mT6E4pxg+3FCsIFSRVmhp9Olb5s2r20qokgIN x11g== 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=bTLpPxXzD/pPUtTjuFKMjey5G5BZ0JbRwZAora190Wo=; b=RA+F9PqFaIFzHkIEvWDAjinZzWu79TdNa0XT/IPSS6XjeVAVpQ96wMy96/Ea2oik3G qkVXvGFIsaqIvTiGsyP6OgE2GbUCwHrnqrq42oUMWaUx8ohhjmhoOkQ3hmci1xbejiaE cXP/FLPlZC8o7U/hoxZ//bN7MWviukBlm8q3Bp8q3RzZFAoM0Hr3FFkSxQy0sga41f2U CkbIIUdoAOw2RDpNDfD47kwRclwTjxo2PL4lOCqduE9YGO6VddJtYxtPyDJfMnh8GCWe v/VsXdPApUiNcN/NilzeNLVBUotEF5bDhjeA1uB+v6A4ryM8b96nMnmkPBC1tVkMLDeC RjMQ== 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 mu6-20020a17090b388600b0022bf337cea4si2200658pjb.44.2023.02.09.04.00.45; Thu, 09 Feb 2023 04:00:58 -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 S229837AbjBIL55 (ORCPT + 99 others); Thu, 9 Feb 2023 06:57:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229842AbjBIL4P (ORCPT ); Thu, 9 Feb 2023 06:56:15 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2634D5C49A; Thu, 9 Feb 2023 03:46:33 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PCFSg1N6jz4f3v77; Thu, 9 Feb 2023 19:46:27 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAn3rEQ3eRjgb0tDQ--.53508S14; Thu, 09 Feb 2023 19:46:29 +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 12/21] ext4: remove unnecessary check in ext4_mb_new_blocks Date: Fri, 10 Feb 2023 03:48:16 +0800 Message-Id: <20230209194825.511043-13-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--.53508S14 X-Coremail-Antispam: 1UD129KBjvdXoW7JFyrZFW5uw43Zr15KF48Zwb_yoWDtrb_GF ykA348Ca1ftw1Ska1vyr40qF1YgFs5tF18XFZrKr43ZF15X3yru34kArs3ZF1kWay2yasx Ww1rAFy0kr4S9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbSxYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6x kF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUIL05UUUUU 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?1757354716560093436?= X-GMAIL-MSGID: =?utf-8?q?1757354716560093436?= 1. remove unnecessary ac check: We always go to out tag before ac is successfully allocated, then we can move out tag after free of ac and remove NULL check of ac. 2. remove unnecessary *errp check: We always go to errout tag if *errp is non-zero, then we can move errout tag into error handle if *errp is non-zero. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 74da24c9bf14..bdabe0d81d4a 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5641,16 +5641,15 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle, *errp = -ENOSPC; } -errout: if (*errp) { +errout: ac->ac_b_ex.fe_len = 0; ar->len = 0; ext4_mb_show_ac(ac); } ext4_mb_release_context(ac); + kmem_cache_free(ext4_ac_cachep, ac); out: - if (ac) - kmem_cache_free(ext4_ac_cachep, ac); if (inquota && ar->len < inquota) dquot_free_block(ar->inode, EXT4_C2B(sbi, inquota - ar->len)); if (!ar->len) { From patchwork Thu Feb 9 19:48:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54893 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp289884wrn; Thu, 9 Feb 2023 04:00:05 -0800 (PST) X-Google-Smtp-Source: AK7set81XdUEblQjBMETAsd5G657Gib1VXBswmP4ARUeLIcZ4pjhH4tsibZDUJ92WW0BSDYhkJHE X-Received: by 2002:a17:903:2448:b0:198:f027:5925 with SMTP id l8-20020a170903244800b00198f0275925mr12480625pls.64.1675944005565; Thu, 09 Feb 2023 04:00:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675944005; cv=none; d=google.com; s=arc-20160816; b=pIl2h/7Z4sZPXtKmqnJsF7/caoBvPSDN+PbXsQIHkPXwPmE7h2SkDBcZQXWrl1iON6 diRJ3rirBt1z+leMfhSPnRvbwASgG9lxhqsRcpdxvRVD5LOPrAFCM+oqOVv6IdK4tOVI jJaA1MMsN1wvtmZ3a6hanXdCXeG3fp2y86WRGKEuldK5cEYybP96omGhVp8KC4QKnJCX E0RwpN3/7KRZQU53SPmZIRfn8kiG3frKO/Uq3/D7aFpKf95AcYXrUu1YTrLvHFDQjayJ hBysSGpt/th9RGJ33m801S/CyS6xluvlGEIWW994j5ylUgrKdK9Mk1E9DNXzys00c8D3 3Ueg== 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=uRbeH3zHs7eJ5a2tjAze7Sxj2qSEgXvXuTG7g8Yjccs=; b=iVCMJm5IZogE7OieyiHoC1dZ4SejRjd9OXSMsh7WDj04JsWCnBFfatX6/5X+Jj4nJW g6U05atiQW4OcEkabQilM2OtN8J1BDkuTDK1iU4ASdVZaxfjtG00hRWrPXGlMoUUeOdZ miVaQMQ7vuzc0ZU9usYxc8uHbcR0oPoOc+YXkKgnIkLPtzPI74sh/DVTqJqSI+l3Xs7G GsB3qaxJdv9Dqp7AScaL6UEDij/n04BROEFmNb25HOF/+EXU8SPWICoFcEoNEUlhflqX RAhq4J5YoLth4RQ/tL47hj/BAhmBOU7olTuhXhf6fv8XP6aUrxEYWo9+Ww5fTnA/Xn3M 0Cyw== 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 u69-20020a638548000000b004fb456c442bsi1732999pgd.840.2023.02.09.03.59.33; Thu, 09 Feb 2023 04:00:05 -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 S230349AbjBIL5v (ORCPT + 99 others); Thu, 9 Feb 2023 06:57:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229822AbjBIL4O (ORCPT ); Thu, 9 Feb 2023 06:56:14 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E3925C497; Thu, 9 Feb 2023 03:46:32 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PCFSg4RwNz4f3jqV; Thu, 9 Feb 2023 19:46:27 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAn3rEQ3eRjgb0tDQ--.53508S15; Thu, 09 Feb 2023 19:46:29 +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 13/21] ext4: remove dead check in mb_buddy_mark_free Date: Fri, 10 Feb 2023 03:48:17 +0800 Message-Id: <20230209194825.511043-14-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--.53508S15 X-Coremail-Antispam: 1UD129KBjvdXoW7Xr4rJr4xZF45Gr18Gw43trb_yoW3Cwc_Ka 43A3ykJrWrtr4Fka4kAr4vgr48K3Z5Cr47X345tr4xWFyUW393Aw1Dtrn3AF1xu3y2yrWD GF95Ga47uF4FgjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbSxYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6x kF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUIL05UUUUU 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?1757354661179733532?= X-GMAIL-MSGID: =?utf-8?q?1757354661179733532?= We always adjust first to even number and adjust last to odd number, so first == last will never happen. Remove this dead check. Signed-off-by: Kemeng Shi --- fs/ext4/mballoc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index bdabe0d81d4a..0fdbf16ac180 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -1718,7 +1718,8 @@ static void mb_buddy_mark_free(struct ext4_buddy *e4b, int first, int last) break; order++; - if (first == last || !(buddy2 = mb_find_buddy(e4b, order, &max))) { + buddy2 = mb_find_buddy(e4b, order, &max); + if (!buddy2) { mb_clear_bits(buddy, first, last - first + 1); e4b->bd_info->bb_counters[order - 1] += last - first + 1; break; From patchwork Thu Feb 9 19:48:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54890 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp289511wrn; Thu, 9 Feb 2023 03:59:16 -0800 (PST) X-Google-Smtp-Source: AK7set9r3GOj4adamCD/oDjuBl7lucvV8w39jy+RVWQCvdE4NlwOHVNubKRet7RrwirSaquByVlk X-Received: by 2002:a17:906:7247:b0:88c:a3f0:4e3f with SMTP id n7-20020a170906724700b0088ca3f04e3fmr12259055ejk.22.1675943956810; Thu, 09 Feb 2023 03:59:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675943956; cv=none; d=google.com; s=arc-20160816; b=mjVCQg+edU53+swfxp5oycelqRg8UPQNkZYq32rrIUacXO/tb5s9ZvQMK72N2GmYd9 xFonUoSwPhWLnz3Ddw4YJfJnE6G0N+r9LfTSH6JE//aaCRrhVux1bNsU6bPwnbPaYMkr RQ0gCNxSKBgwrwadhizkcdRUB9vmLO2GPw53Fdwz53saLAEnh9Hhumh1NZr6xR4/nJ2e nHeFjJoJpCwcKReQNQrleWEs0N0oBAbXYJlIvz50aXvvpafemfB2SzC5gY5yagLFiBXw 5KE+2j1G+zF9T4k9oZJK0ohBpzII30ieheJCsgzVWXvQiJ7YfXbY6J/7vmhTYHSPJIrE hj+w== 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=LUQlOevBBL88yDd//Bydx/kS8xm4lM/iukd4LVBswmc=; b=cOWy6iZmK/HwRtyMxsb/3b41peRJRTD3p+n7syT1F+kq7QARqfWaW83ogO3YB6k08/ jDAxqW6ugxVnwyRv4LsEX6kXaOSyOElpwPjRs6if5Qo0JGpLksZC7ptbGB2Wpkyk15wO dd9oq0whJaaTW4iZnsQFJ6rqhRvGgEfJPfzsPkEsgToYH4Mn5uSX7R004Ie2MYNBsQcY STFM9cnbrGArDAjmItqTQrFtW5Jtp+OWSxo1agY+V519LeVUCWsowN9wxLvGlJfUQ/4G pTFANtXpORAEEDoZgEKT62MPd8XAQj5N7z7yp4WZjPQ8oqHRH/VHPw0AfItZ3ucxzYg4 SNoA== 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 fh10-20020a1709073a8a00b0088c2a3a6f9csi2203795ejc.199.2023.02.09.03.58.51; Thu, 09 Feb 2023 03:59:16 -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 S230402AbjBIL5y (ORCPT + 99 others); Thu, 9 Feb 2023 06:57:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229952AbjBIL4P (ORCPT ); Thu, 9 Feb 2023 06:56:15 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A67C45C498; Thu, 9 Feb 2023 03:46:32 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PCFSg6Qshz4f3k5d; Thu, 9 Feb 2023 19:46:27 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAn3rEQ3eRjgb0tDQ--.53508S16; 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 14/21] ext4: remove ac->ac_found > sbi->s_mb_min_to_scan dead check in ext4_mb_check_limits Date: Fri, 10 Feb 2023 03:48:18 +0800 Message-Id: <20230209194825.511043-15-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--.53508S16 X-Coremail-Antispam: 1UD129KBjvJXoW7KrW5tF1rZrW3CryUCr17Wrg_yoW8WF4rpF srCFyUW34xWr1a9wsrK3Z8W3WrKw4fKF1xJryS9r1rAF17X3yqka9xtFyUZF9Fyrs3Z3Z3 ZFyYqr4UGw4Ika7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 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?1757354610384178657?= X-GMAIL-MSGID: =?utf-8?q?1757354610384178657?= Only call trace of ext4_mb_check_limits is as following: ext4_mb_complex_scan_group ext4_mb_measure_extent ext4_mb_check_limits(ac, e4b, 0); ext4_mb_check_limits(ac, e4b, 1); If the first ac->ac_found > sbi->s_mb_max_to_scan check in ext4_mb_check_limits is met, we will set ac_status to AC_STATUS_BREAK and call ext4_mb_try_best_found to try to use ac->ac_b_ex. If ext4_mb_try_best_found successes, then block allocation finishs, the removed ac->ac_found > sbi->s_mb_min_to_scan check is not reachable. If ext4_mb_try_best_found fails, then we set EXT4_MB_HINT_FIRST and reset ac->ac_b_ex to retry block allocation. We will use any found free extent in ext4_mb_measure_extent before reach the removed ac->ac_found > sbi->s_mb_min_to_scan check. In summary, the removed ac->ac_found > sbi->s_mb_min_to_scan check is not reachable and we can remove that dead check. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 0fdbf16ac180..e53f84de5018 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2039,8 +2039,7 @@ static void ext4_mb_check_limits(struct ext4_allocation_context *ac, if (bex->fe_len < gex->fe_len) return; - if ((finish_group || ac->ac_found > sbi->s_mb_min_to_scan) - && bex->fe_group == e4b->bd_group) { + if (finish_group && bex->fe_group == e4b->bd_group) { /* recheck chunk's availability - we don't know * when it was found (within this lock-unlock * period or not) */ From patchwork Thu Feb 9 19:48:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54896 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp290552wrn; Thu, 9 Feb 2023 04:01:05 -0800 (PST) X-Google-Smtp-Source: AK7set8dkUZs6wBZdJDMOS2dHfJ3aNJ6dk9Dgy2Vh3Cgg6LblLZsT0S8j0nxNwzJDf2uQqIFztsD X-Received: by 2002:a17:903:2448:b0:198:f027:5925 with SMTP id l8-20020a170903244800b00198f0275925mr12485023pls.64.1675944064516; Thu, 09 Feb 2023 04:01:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675944064; cv=none; d=google.com; s=arc-20160816; b=j27SvymKxav1GTkvukiFiI4liFUfoh49Xt6YBO5DFeYs+CxF2TsSzeBGfbPEOVNL0d Fl/sZs8aLB0WvF1ZPSiyGlBlMfp0xNaJ6Nq2nuKW1Bs8Qs0mideCdlT+lTm01X4n4ppg +42C1+Yoh29c7XmUEhyd6T09EkAxNge1SmdyDvipU3hsCzMHZxcefnGrJNBhuCQMpixN UyYB+ee6BHWCMBpnrolLpbwqNDPHuDluhIrRYp47xzgbZLYdwTvfa2x0cp1HTdk0i0Ea GRGTdHQtOExjCXUdaoyC+cfs5mQgK4GDdeAGJ4wTprvluMeYXfc3Qt24JSWwLnVvDFdk XRQQ== 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=btNqux62mYcL23Bq+fIieNQq4PtjIIEvkzE/bbbAp7I=; b=uWU0YjihlWOYQBWwCFJwMxNUVWR31JUmKilfkif4Mzy/o3nmn3ClWqxt+XQX8Zswxi 7LYqFsHYp/qurKP+hjV9Uw0RWsfcq/InM43e6jztgBUjzkrlOxz1mkyQOIW0nWq+c1Vx pZBay5odyWG8L246lZFQ2wvdmBDV8kwptwJaMVCBpClgpyPkW/9ZcHQuWQYR1tFPWX6a QxRmEdttcbWAoXYGHfpxIcG9vAQYhnDaIHscCv9aMIpFbboZMCnejQMUdLtTAKiCDBsE 5Ra/Z16dQ71E77X+1KbJRv6cBm6vVRoATNJYevX/tKT0LfSzoZdSKyfWQgQQAKNnM1ZG NoLA== 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 iw6-20020a170903044600b001925dbac333si1485698plb.312.2023.02.09.04.00.49; Thu, 09 Feb 2023 04:01:04 -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 S230472AbjBIL6A (ORCPT + 99 others); Thu, 9 Feb 2023 06:58:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229633AbjBIL4P (ORCPT ); Thu, 9 Feb 2023 06:56:15 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B7785C49E; 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 4PCFSh1nRkz4f3k5q; 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--.53508S17; 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 15/21] ext4: use best found when complex scan of group finishs Date: Fri, 10 Feb 2023 03:48:19 +0800 Message-Id: <20230209194825.511043-16-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--.53508S17 X-Coremail-Antispam: 1UD129KBjvJXoW7Kr18ZF4rJry5XrW8Kr15urg_yoW8GrW5pr sxJF4UuryfWr1Duw47Ca13X3W5Kw4I9r18ArWIgw18WF17Z39Y9anrtry09FykJrZ5AF9x Zr4jvF4UGw47Ka7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 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?1757354722858597187?= X-GMAIL-MSGID: =?utf-8?q?1757354722858597187?= If any bex which meets bex->fe_len >= gex->fe_len is found, then it will always be used when complex scan of group that bex belongs to finishs. So there will not be any lock-unlock period. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index e53f84de5018..c684758d6dbb 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2019,8 +2019,6 @@ static void ext4_mb_check_limits(struct ext4_allocation_context *ac, struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb); struct ext4_free_extent *bex = &ac->ac_b_ex; struct ext4_free_extent *gex = &ac->ac_g_ex; - struct ext4_free_extent ex; - int max; if (ac->ac_status == AC_STATUS_FOUND) return; @@ -2039,16 +2037,8 @@ static void ext4_mb_check_limits(struct ext4_allocation_context *ac, if (bex->fe_len < gex->fe_len) return; - if (finish_group && bex->fe_group == e4b->bd_group) { - /* recheck chunk's availability - we don't know - * when it was found (within this lock-unlock - * period or not) */ - max = mb_find_extent(e4b, bex->fe_start, gex->fe_len, &ex); - if (max >= gex->fe_len) { - ext4_mb_use_best_found(ac, e4b); - return; - } - } + if (finish_group) + ext4_mb_use_best_found(ac, e4b); } /* From patchwork Thu Feb 9 19:48:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54897 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp291001wrn; Thu, 9 Feb 2023 04:01:40 -0800 (PST) X-Google-Smtp-Source: AK7set9/T42unHc19uhsQGVtRsyEwXWxRDd5CPqVdH2K5ThifpamPNKD9BkgPD+aiVPxX2gzFsSa X-Received: by 2002:a05:6a20:c191:b0:bc:6ffd:c064 with SMTP id bg17-20020a056a20c19100b000bc6ffdc064mr11524229pzb.25.1675944100504; Thu, 09 Feb 2023 04:01:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675944100; cv=none; d=google.com; s=arc-20160816; b=rd0Ksk5llaHDUhQtFFI1NndnsEinhPdLqwSzlMuRHRXN7uG6Q3cLkz4hAK+egizGuj +Tk4cGy+uPRCxjv+xjXC13+2VXfby6XBnJWKKFvfx12JIggSegmvpQpRKLmsgupLBmFH WSj69YKT7TMYX3A2q6cpvOdTfgACLVXV2f1lVynXMoM4HybIpG2WGUcyyFTHmHFQ/0VJ MErNyZPdsKVH5sUw9bWQ6G0JON8pqg6aHhUyrfrH/WwgRMsZYsTelSzcE4kmCPDnZLxq aKwX7AvXiT8xrk3BpOrGB7LW+3k6hHVAqu9wsP6t5g4kOr7qzJL26KyhDD9zTInJGbY9 9+sA== 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=TuRkHB9i/I6xK4A/Q3V9DrZO9YKcHo3t+KuJS5VEqTI=; b=vH8bWgK3B3JSYwzy6njBTccxwp0sG1eTwPYRgXuJ7W1AGTJWwPWYDMcVHv5jCdL5gV 8eKLR7XqUZlOkd8h+N1mtJvyTxhHantxKIrbbgiwSp1oT62fK0qkF0zTcEp8uDPIHlMt h03d7dqYWBATUix6GLWHcwzZqZYTrYnwtiWUksPKP5sPdgYi5q74ctXBtGMjPRzyVy4U TvT0erGVAYpL2l9lMF0IJxh5yImpxEFI7QwLNWHJrIAaGzxo52az75diPHtZXobbm3um pkCtOhAmafRK2wVDrQHQT3tE46elkT8E2SzISL6GxwFahMQLfHwRVkejJbtiuOZwJnqp Vuuw== 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 j3-20020a63b603000000b004fb3ebf19fesi1748195pgf.798.2023.02.09.04.01.21; Thu, 09 Feb 2023 04:01:40 -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 S230480AbjBIL6E (ORCPT + 99 others); Thu, 9 Feb 2023 06:58:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229498AbjBIL4Q (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 64AA55C49F; 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 4PCFSh47Pmz4f3k5r; 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--.53508S18; 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 16/21] ext4: remove unnecessary exit_meta_group_info tag Date: Fri, 10 Feb 2023 03:48:20 +0800 Message-Id: <20230209194825.511043-17-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--.53508S18 X-Coremail-Antispam: 1UD129KBjvdXoW7XFW5WrWrXF15KrWfJw4DXFb_yoWDXrc_Aa y7JFW8WrW8Jr1fKa1Ig393tr48tF4rAr1kXF4ft3y3ZF1UWrs5u3WkArnxArZruay7JFyU tr93JryxGa1IqjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbSxYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6x kF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUIL05UUUUU 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?1757354761167538002?= X-GMAIL-MSGID: =?utf-8?q?1757354761167538002?= We goto exit_meta_group_info only to return -ENOMEM. Return -ENOMEM directly instead of goto to remove this unnecessary tag. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index c684758d6dbb..289dcd81dd5a 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -3069,7 +3069,7 @@ int ext4_mb_add_groupinfo(struct super_block *sb, ext4_group_t group, if (meta_group_info == NULL) { ext4_msg(sb, KERN_ERR, "can't allocate mem " "for a buddy group"); - goto exit_meta_group_info; + return -ENOMEM; } rcu_read_lock(); rcu_dereference(sbi->s_group_info)[idx] = meta_group_info; @@ -3123,7 +3123,6 @@ int ext4_mb_add_groupinfo(struct super_block *sb, ext4_group_t group, group_info[idx] = NULL; rcu_read_unlock(); } -exit_meta_group_info: return -ENOMEM; } /* ext4_mb_add_groupinfo */ 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); } /* From patchwork Thu Feb 9 19:48:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54898 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp291337wrn; Thu, 9 Feb 2023 04:02:04 -0800 (PST) X-Google-Smtp-Source: AK7set8vMH/OJfOjno947EU+Ro1XrmvEn/f7PAP6n7qwbJko51TmpiGlB0T9GlsPHvUatmUlkHZa X-Received: by 2002:a05:6a20:d002:b0:af:fcb6:2ee2 with SMTP id hu2-20020a056a20d00200b000affcb62ee2mr8750252pzb.47.1675944124187; Thu, 09 Feb 2023 04:02:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675944124; cv=none; d=google.com; s=arc-20160816; b=QYZDNcesizaso5fSgcJsrFvfifo0Akb7Le1UwkSG2hnD4CU+kbCXd9lthrZY47F/08 RsouwMorT6/8J/rU5kydqY8rxO0YoljhpKsAjSZ1CfqzdENTk7vnJSzuFcBD287vDin0 AAF8dhKiOpPmfpICFh0pvb24/D0xnX3X57tl2JDR4kf66Qkn22pfoEjR4UV1bgimP3IK UXuNY0Of7344g2+/aJ4jvMtcN79bQNjCvcc8mqm7+EeKHU8Nx+yz9thDD3LKWkWu+P5/ k8OD29TErOxQKCq0PnHppRUk5Js+ANSNz7JMJ3ozW5qcwaHTc0o2kUG9Fdm7Sy0V+YQZ obZA== 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=6S7mxx3rkcQFbLF8zJSI+RY82xes6SjYyBBaqorpMog=; b=FUyabKZ0LjEu7hbFCotmRDW8KClXbLy3XKccN3ZIIgsZisCS2pomoPdARL9jgDHBoQ 9HUxkjwbKqxfyrZDtPfORzz7F05jTF+hZkFqsRzCdR1/+H4rUhfKXXj4M4HknKqUl/kU +RN6WMDF0wG03c0Aj2tCqGhqhXlFrjRW09+Cb5pjMz6jFgnJwk6iAdwtiaj/w85Y5TPa X/Mbn0Wx1ts9AiqXNzINa4zjAIXsVy4Ok5abha4bhv6BZRYHmGODp5vdC2PIDRrhdlLf m7Gd3NlcCQdTdGzjo2kMG/5pdYjIShTVHjUz60g5uHhao0ICVFCn4JwsGA3J1SCf4arl wPPg== 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 u69-20020a638548000000b004fb456c442bsi1732999pgd.840.2023.02.09.04.01.41; Thu, 09 Feb 2023 04:02:04 -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 S229737AbjBIL6I (ORCPT + 99 others); Thu, 9 Feb 2023 06:58:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229508AbjBIL4Q (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 F2A775C4BA; 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 4PCFSj1VSRz4f3jpt; Thu, 9 Feb 2023 19:46:29 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAn3rEQ3eRjgb0tDQ--.53508S20; Thu, 09 Feb 2023 19:46:31 +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 18/21] ext4: remove unnecessary goto in ext4_mb_mark_diskspace_used Date: Fri, 10 Feb 2023 03:48:22 +0800 Message-Id: <20230209194825.511043-19-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--.53508S20 X-Coremail-Antispam: 1UD129KBjvdXoWrZrWrKrWrGF43GFWkXFykGrg_yoW3WFX_Ja 47Ar48ZFWrJF1fuF1vy3WFyr4kKa9YkF18XrWxtrWfZa4DWayruw4kArnayrZrW3Way343 GasxuryUXrWFvjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbSxYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6x kF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUIL05UUUUU 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?1757354785773233960?= X-GMAIL-MSGID: =?utf-8?q?1757354785773233960?= When ext4_read_block_bitmap fails, we can return PTR_ERR(bitmap_bh) to remove unnecessary NULL check of bitmap_bh. Signed-off-by: Kemeng Shi Reviewed-by: Ritesh Harjani (IBM) --- fs/ext4/mballoc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index f9fc461b633f..7d6991af50d8 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -3739,9 +3739,7 @@ ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac, bitmap_bh = ext4_read_block_bitmap(sb, ac->ac_b_ex.fe_group); if (IS_ERR(bitmap_bh)) { - err = PTR_ERR(bitmap_bh); - bitmap_bh = NULL; - goto out_err; + return PTR_ERR(bitmap_bh); } BUFFER_TRACE(bitmap_bh, "getting write access"); From patchwork Thu Feb 9 19:48:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54900 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp292153wrn; Thu, 9 Feb 2023 04:03:07 -0800 (PST) X-Google-Smtp-Source: AK7set8xucubzuHOyEJUnZ17UeI77BncOTBQNdQsjK+3lY64u5M9M7lifzcJoutYBIhyBg/Pv2QJ X-Received: by 2002:a17:90b:1d90:b0:230:e9ff:7292 with SMTP id pf16-20020a17090b1d9000b00230e9ff7292mr11555258pjb.40.1675944187611; Thu, 09 Feb 2023 04:03:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675944187; cv=none; d=google.com; s=arc-20160816; b=RqCgsq1YuURaWTVSNepNJsqtRdnCiZfJ4K2B/RlSLf+4ls3ZPCU5LCFx8OT3C1e1M2 YvrNjVApz3Btvr/vAOgRzHqyXEmmZlEVL7Gb7kFY+EM5p4IRO8b3ydpLh2AziPTF2OVZ WGbfmKRRH5t4ok+BajGifgAZHc+R5p/nKDQL++uF4FxrUyji5jGPz0FtgsHC4JaSghwc Fn8n2pVbe4cDohyLLWMU4fjDQ0Ctt+8jg3E0Q4L7iNxMcayVUijz2R+/DtSg+UGVzjEJ 3Cgevk7shd91XvExue1rP1COwJIev+D5++HCbrPwF39rRztr23rdaknXCwwQBuX8b40f x7Mg== 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=v50C3ZsDefqI9m6ZHfjuF2K9+cOUTJkbsptEWrMOS5w=; b=oa/VVRxOZAvb3VZ82Ic2VzMl6W9+OSTz42c809S2jdcyVlvy8VPej9g2garDni2x1J e1S6gofcR7ZA+kx2QlWUBGKMzxhyZFZitt4jZBnV1AVdfquO53wGmTBVPBwOlcor3dJv Z7M7bj4/nodyLS2diZZs+pfa/Zyex8SO72JrweobMQBvBpLOzucQ5orGVZyXg7rcrtdT a2LOzmFQGWNBfTaEYRPJaZE0CtwH7JJXoj4zLGdBuR6QbFTbDba704RR20J9fxSaVoxg 6V8HmzyJ3sh8aVEs2AEjkJVeLRBHhAoDjL0m9VwOm0n+LMSgvdlWzN59mkUqpaXSIvCU dw+Q== 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 j70-20020a638b49000000b004b244d7b441si1946572pge.414.2023.02.09.04.02.40; Thu, 09 Feb 2023 04:03:07 -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 S230501AbjBIL6M (ORCPT + 99 others); Thu, 9 Feb 2023 06:58:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229623AbjBIL4Q (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 4C3BD5DC0A; Thu, 9 Feb 2023 03:46:34 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PCFSj3SMcz4f3k5v; Thu, 9 Feb 2023 19:46:29 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAn3rEQ3eRjgb0tDQ--.53508S21; Thu, 09 Feb 2023 19:46:31 +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 19/21] ext4: remove repeat assignment to ac_f_ex Date: Fri, 10 Feb 2023 03:48:23 +0800 Message-Id: <20230209194825.511043-20-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--.53508S21 X-Coremail-Antispam: 1UD129KBjvJXoW7tryxGr18Cw1fGF1fGr4UArb_yoW8Wr1Dpa nxtF1Skw1fWr1DCFZ7W3Z8J3WSkw47Gr4UJryFg3WrJFZxKFW7Cw4kta4xXa9xCrZ3AFnx ZrWIyF1UGrsrG3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 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?1757354852634870906?= X-GMAIL-MSGID: =?utf-8?q?1757354852634870906?= Call trace to assign ac_f_ex: ext4_mb_use_best_found ac->ac_f_ex = ac->ac_b_ex; ext4_mb_new_preallocation ext4_mb_new_group_pa ac->ac_f_ex = ac->ac_b_ex; ext4_mb_new_inode_pa ac->ac_f_ex = ac->ac_b_ex; Actually allocated blocks is already stored in ac_f_ex in ext4_mb_use_best_found, so there is no need to assign ac_f_ex in ext4_mb_new_group_pa and ext4_mb_new_inode_pa. Just remove repeat assignment to ac_f_ex in ext4_mb_new_group_pa and ext4_mb_new_inode_pa. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 7d6991af50d8..dec716f331ac 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4635,10 +4635,6 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac) BUG_ON(ac->ac_o_ex.fe_len > ac->ac_b_ex.fe_len); } - /* preallocation can change ac_b_ex, thus we store actually - * allocated blocks for history */ - ac->ac_f_ex = ac->ac_b_ex; - pa->pa_lstart = ac->ac_b_ex.fe_logical; pa->pa_pstart = ext4_grp_offs_to_block(sb, &ac->ac_b_ex); pa->pa_len = ac->ac_b_ex.fe_len; @@ -4689,10 +4685,6 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac) pa = ac->ac_pa; - /* preallocation can change ac_b_ex, thus we store actually - * allocated blocks for history */ - ac->ac_f_ex = ac->ac_b_ex; - pa->pa_pstart = ext4_grp_offs_to_block(sb, &ac->ac_b_ex); pa->pa_lstart = pa->pa_pstart; pa->pa_len = ac->ac_b_ex.fe_len; From patchwork Thu Feb 9 19:48:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54899 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp292085wrn; Thu, 9 Feb 2023 04:03:02 -0800 (PST) X-Google-Smtp-Source: AK7set8nFtwD8hamaPm30tNvn/3OpZJVnVwqa6rHYXWraT6GzxtGJiqUVljI26+7+/CHhr3iXQ1B X-Received: by 2002:a17:902:e5c7:b0:199:2451:fea7 with SMTP id u7-20020a170902e5c700b001992451fea7mr12966290plf.21.1675944181743; Thu, 09 Feb 2023 04:03:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675944181; cv=none; d=google.com; s=arc-20160816; b=S6qE32pn5Y9ZR9ZzbmA5WorjuxRKOwLrDA9GbJPAs5XDRjCtasm+GM/zZAisfLEb3u LmU6Tqa0HRcWeJut9GfGb/ZTVtqCZfqlHX3fuk7bVXJB8eBwQWBqgSi6XEu0fSEsMfoQ fdMU1HBZiBa6R1rMygCBBr+NitQ/+UkAZOriNyIe+dbh9R1Rn8riB+kyzG4c049sVgoT 2oIDhIaXEapua6zGCgwxABqgQd6cWXEXDZKS5pgIGM7sZ1LtSE180X9JhT7ZvDqcT/+f Y59CP2vs9pWUz8z60UV64Fyi/9STD9xKSWMH15jal9MvVGNdn7ohc1b+HTguav1GJ1/s Rz1Q== 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=9UuKOFJhrHHc9cOYsSwB4j9HEVGav8QzxYEdncQ88hQ=; b=Tff9MqzW3T/MFvUMYhiJNS6nvuTzr23dYbK/SRV+EEg3OtXAk/zN9Q0kcF9M+diRCi f774gPLs6rTYN09tFJYhS5pifbeUNLQKFVx6o3DpIP3AFX28y4lV1SLIaYBdF2TKMzXO k7qn90mFDggbx+GpFeysgIymZ24sX53wnjYLOGwyROyg9WMZKr3jrLc6bTGswseOvoPs yCPNEpnGLygRPMJ1VS9XsmzQSLGdhncnngubtsjcPyI0JPtuxEBGh6gErSrNGSDLLdtf WnmdwOjF8DpRbTb0YKLYlzsT5JIk5P9Z3QGo9Mo5dSf4rbsxvd9KWmyrge6/HdVgTKmA bNmw== 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 17-20020a170902c21100b00189e752b2f8si1510045pll.328.2023.02.09.04.02.37; Thu, 09 Feb 2023 04:03:01 -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 S229570AbjBIL6R (ORCPT + 99 others); Thu, 9 Feb 2023 06:58:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229649AbjBIL4R (ORCPT ); Thu, 9 Feb 2023 06:56:17 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B2D75DC1F; Thu, 9 Feb 2023 03:46:34 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PCFSj6Fkqz4f3nTj; Thu, 9 Feb 2023 19:46:29 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAn3rEQ3eRjgb0tDQ--.53508S22; Thu, 09 Feb 2023 19:46:31 +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 20/21] ext4: remove comment code ext4_discard_preallocations Date: Fri, 10 Feb 2023 03:48:24 +0800 Message-Id: <20230209194825.511043-21-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--.53508S22 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYu7kC6x804xWl14x267AKxVWrJVCq3wAF c2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62 vIxIIY0VWUZVW8XwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E 14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI 8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vE x4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzx vE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWU JVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7V AKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26ryj6F1UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVW8Jr0_Cr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JV WxJwCI42IY6I8E87Iv6xkF7I0E14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZEXa7IU0Tq cUUUUUU== 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?1757354846026588721?= X-GMAIL-MSGID: =?utf-8?q?1757354846026588721?= Just remove comment code in ext4_discard_preallocations. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index dec716f331ac..5bc30cd5debf 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4925,7 +4925,6 @@ void ext4_discard_preallocations(struct inode *inode, unsigned int needed) int err; if (!S_ISREG(inode->i_mode)) { - /*BUG_ON(!list_empty(&ei->i_prealloc_list));*/ return; } From patchwork Thu Feb 9 19:48:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54901 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp292282wrn; Thu, 9 Feb 2023 04:03:19 -0800 (PST) X-Google-Smtp-Source: AK7set+4g1SzoYPUzchJ0VjUvfggFlHl5rp6xRtPTCYho+zUu2ap7+KjLiOn2GxuaRCS6gawu2hN X-Received: by 2002:a05:6a20:12c9:b0:af:98cd:7df1 with SMTP id v9-20020a056a2012c900b000af98cd7df1mr14412503pzg.24.1675944199401; Thu, 09 Feb 2023 04:03:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675944199; cv=none; d=google.com; s=arc-20160816; b=FP/dMLgQB1YhIztOmiyypOzqmw8diatOovv/FRylr7w1AgHRdkHz83l6kSroukjXyh W0kqOlafbgJghWeBpIFbHHx5tH2l5c60v7wI7q80fqp9SCXtsSZ7WS8FNH77+I01jjEC 8xBDzj2SFpRL1wnQhAIYKwmebk4Wqrt3gXKqrHluH8OWeVfIUqhWYxUB5d499HPYJAuv wSAWm8pA8COhd/xh/aYxMv9jENufxxwMMtjM7SDzb3DtLuMwXQNxKb0u2TU0fH8KdqZk 4rQRDG4dzQDuvEsVd+Y3x4v8KNmszrFEZfLMvJ1zX+WBwaPt2qGiIgGxXOS+6XzP/nJA 9C2w== 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=oViMFAb8RNlZFAEITL5nv9IdaPdkQMKgxZ2fITA378w=; b=LP27TK3NWKPgaugswxu0xuZ0ptqsE9VgMm/VUaPRHdxzzSsi+zvQxu+6xhNdsLolyi RlB+3ymwuLjvSZ1xW7DbMt9isM8SLbcVtAi2rL0Aln9VgnoeyBqB9rq6mxxNUcOZOmEu TLZIHI1XOhLko93+Cdzuj+BJSkRTRqi25uVEXYN6niSKInwKx0ATUh5DZXtxyWixhNzK bElEtK3scfPsNt+vKQURmcPgZSDkOb6ExTK9l9owpTFwsTH7ODFTdddXRe62g/uFlGza r0ohBJnNmqAR08DGzh1yxqA6FYdjQHkqOjL2AqSqC2Q3KvQ33vJao9gaC0+5XWY11zH3 S1lg== 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 w189-20020a6382c6000000b00479503041c4si1857077pgd.368.2023.02.09.04.03.03; Thu, 09 Feb 2023 04:03:19 -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 S231137AbjBIL60 (ORCPT + 99 others); Thu, 9 Feb 2023 06:58:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229765AbjBIL4R (ORCPT ); Thu, 9 Feb 2023 06:56:17 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 081D05C4A6; Thu, 9 Feb 2023 03:46:34 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PCFSk0tgTz4f3k61; Thu, 9 Feb 2023 19:46:30 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAn3rEQ3eRjgb0tDQ--.53508S23; Thu, 09 Feb 2023 19:46:32 +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 21/21] ext4: simplify calculation of blkoff in ext4_mb_new_blocks_simple Date: Fri, 10 Feb 2023 03:48:25 +0800 Message-Id: <20230209194825.511043-22-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--.53508S23 X-Coremail-Antispam: 1UD129KBjvdXoWrtFWDZw4xCw4DKr4UCw4fGrg_yoWfKFc_Ka 4xZr48JFyrJr1fuFnYqrZ8tFW7ta1xAr1ruFWIqrySvF1YqFWxu3WDArZ0yF9ruay3Aas8 Cr9xurW3KF109jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbSAYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVW5JVW7JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwCI42IY 6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aV CY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x07jstxDUUUUU= 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?1757354865060216526?= X-GMAIL-MSGID: =?utf-8?q?1757354865060216526?= We try to allocate a block from goal in ext4_mb_new_blocks_simple. We only need get blkoff in first group with goal and set blkoff to 0 for the rest groups. Signed-off-by: Kemeng Shi --- fs/ext4/mballoc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 5bc30cd5debf..bd5e4db677c7 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5772,9 +5772,6 @@ static ext4_fsblk_t ext4_mb_new_blocks_simple(handle_t *handle, return 0; } - ext4_get_group_no_and_offset(sb, - max(ext4_group_first_block_no(sb, group), goal), - NULL, &blkoff); while (1) { i = mb_find_next_zero_bit(bitmap_bh->b_data, max, blkoff); @@ -5789,6 +5786,8 @@ static ext4_fsblk_t ext4_mb_new_blocks_simple(handle_t *handle, brelse(bitmap_bh); if (i < max) break; + + blkoff = 0; } if (group >= ext4_get_groups_count(sb) || i >= max) {