From patchwork Thu Jun 29 12:00:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 114144 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9379480vqr; Wed, 28 Jun 2023 21:04:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7wjk6p64U4inNaO/h331vZ4R9NQ8F0lEUOywBK4Zdjumvm/+pldWLoSVUpROZpNKC4U/cM X-Received: by 2002:a17:90b:51c9:b0:262:ba7e:df16 with SMTP id sf9-20020a17090b51c900b00262ba7edf16mr14434839pjb.6.1688011459190; Wed, 28 Jun 2023 21:04:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688011459; cv=none; d=google.com; s=arc-20160816; b=ajhspyh5pQUNUdT9WT4g/3CFcEA6NYcI0mbPyeUL0SBC8CqbKedR7RPxAPU0iUWrqj JKRnMxsEBPsrWAcXREItncOTQLtUy0pzXlGcPrt5CoibhRDYCkXddyC6Jve9j33QDZ6B VtQYpgy8YJ4+qfsZ5jAcedhQURHKXrQUpMVskMzb+vy2YvTm6Sgo1qTsZDmVdUuMmFEI Jwtb8s4RXvQ/56vmunBh+gOwOwsDTJh0/nomujFvw259bCz2fS8kjiJlCenaHF0Y8Pa5 Fy6Vj29pVfCKvJGvzqKBUNViLQiah1cKy4p+L1frwpeIkKU3JzE/rvWyLWePXsq/q146 A4Pw== 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=4jWWciF2CCDZ/Y3v43oUKeyJFiomqCHVdih8Pzvky7c=; fh=eu2llfKjKKC0QBUtW6YWJ13du6subP7SB8ZN6DjSWMA=; b=EywjYNMsC2QwroycYmLTD86BkYgeP8ZFV2G9bVcr6Ajp8zIxSC7DTFvvRdZT3fT8j8 IXH+lgMOH0vS4JrUh25u0G9zZR0m3z45HEdH1YStrndtu77ydej4e4mYcnt+Nsgvjm5S tajV29gYUN7iWhwTZd7ZOazkyKgyahdbKzYs/dmZs44C9ej7op/PNRGwbY8zkJVU+Xt4 9mqpGLYaHg7QxLmu9PKlZhgpYhjvNxc6gAr+9E++C+JTapMElj+REwQxh2XLAUeyEtim Ec6feegSve0U/4G8BFT0q21Sc5qS9Iq37OlNED1CUKzZwPqUU/59CySS+8fAE7aoCf1w uAFw== 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 c15-20020a17090a558f00b0023a177c4951si10355993pji.39.2023.06.28.21.04.06; Wed, 28 Jun 2023 21:04:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231996AbjF2EAQ (ORCPT + 99 others); Thu, 29 Jun 2023 00:00:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230476AbjF2D7x (ORCPT ); Wed, 28 Jun 2023 23:59:53 -0400 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBE7B130; Wed, 28 Jun 2023 20:59:51 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4Qs4TZ0nSnz4f3mLf; Thu, 29 Jun 2023 11:59:46 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quiwAZ1kw6DMMg--.26995S3; Thu, 29 Jun 2023 11:59:48 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 01/13] ext4: correct offset of gdb backup in non meta_bg group to update_backups Date: Thu, 29 Jun 2023 20:00:32 +0800 Message-Id: <20230629120044.1261968-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230629120044.1261968-1-shikemeng@huaweicloud.com> References: <20230629120044.1261968-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quiwAZ1kw6DMMg--.26995S3 X-Coremail-Antispam: 1UD129KBjvJXoW7tw1fKF4fAry3Ww4fuw4rXwb_yoW8AFWDpw 4qkr18Gry8KrWDua1xA340gryFkw48Ga4jvrW3Zw1UuFy7Jas7WF97tF95AF4jqFZ3AFn7 WFWa934UAwn7J3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBjb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_Jrv_JF4l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64 vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8G jcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2I x0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK 8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I 0E14v26r1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x07js2-5UUUUU= 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, KHOP_HELO_FCRDNS,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1770008303747085507?= X-GMAIL-MSGID: =?utf-8?q?1770008303747085507?= Commit 0aeaa2559d6d5 ("ext4: fix corruption when online resizing a 1K bigalloc fs") found that primary superblock's offset in its group is not equal to offset of backup superblock in its group when block size is 1K and bigalloc is enabled. As group descriptor blocks are right after superblock, we can't pass block number of gdb to update_backups for the same reason. The root casue of the issue above is that leading 1K padding block is count as data block offset for primary block while backup block has no padding block offset in its group. Remove padding data block count to fix the issue for gdb backups. For meta_bg case, update_backups treat blk_off as block number, do no conversion in this case. Signed-off-by: Kemeng Shi Reviewed-by: Theodore Ts'o --- fs/ext4/resize.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 0361c20910de..87cd5b07a970 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -1601,6 +1601,8 @@ static int ext4_flex_group_add(struct super_block *sb, int gdb_num_end = ((group + flex_gd->count - 1) / EXT4_DESC_PER_BLOCK(sb)); int meta_bg = ext4_has_feature_meta_bg(sb); + sector_t padding_blocks = meta_bg ? 0 : sbi->s_sbh->b_blocknr - + ext4_group_first_block_no(sb, 0); sector_t old_gdb = 0; update_backups(sb, ext4_group_first_block_no(sb, 0), @@ -1612,8 +1614,8 @@ static int ext4_flex_group_add(struct super_block *sb, gdb_num); if (old_gdb == gdb_bh->b_blocknr) continue; - update_backups(sb, gdb_bh->b_blocknr, gdb_bh->b_data, - gdb_bh->b_size, meta_bg); + update_backups(sb, gdb_bh->b_blocknr - padding_blocks, + gdb_bh->b_data, gdb_bh->b_size, meta_bg); old_gdb = gdb_bh->b_blocknr; } } From patchwork Thu Jun 29 12:00:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 114143 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9379020vqr; Wed, 28 Jun 2023 21:03:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5C1ymT7Q9koJSsL2IpthP1QIQsl5AmbXzZlThSOKFx4d4WFWYI4O1HfK4lEoTahqhXR8GZ X-Received: by 2002:a05:6a20:7f9b:b0:11e:7ced:3360 with SMTP id d27-20020a056a207f9b00b0011e7ced3360mr3981405pzj.4.1688011390944; Wed, 28 Jun 2023 21:03:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688011390; cv=none; d=google.com; s=arc-20160816; b=M77PnikF4uDm7lzF8A+gYG/7NPFD9fm2kGAtX1sRJ7cg/vn0oTJdOoCyin91GsNVwm XA/SJBP4ExCl59LKqGvUx9zs41ytXTVWDbKZDai3JPzI15xUjMtaj5z9QqB2oN1/5+xC YKfLmUeWYgS0mErogaGSdI5zPex5FeP2lKTIqexlhBNiP2v3sgdCIwDw+VTJh3wb4UJg ePk/BRbYMruckKYBOOgOgJJ4GYiK9wL8pbDDM7SsxuEksANJU9njLgKdaNhxQuwjKDod OGOiuJGBkvMB+JbnGIfUzTtJCn9tfeMzLq7hcIL6JwWUm547oWewIFMWvQJ2YMFiMazP Tyrw== 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=ckPZaZPd7oUbVNL3kPcvngZ593sGwkd7QpI5nk3Gjas=; fh=eu2llfKjKKC0QBUtW6YWJ13du6subP7SB8ZN6DjSWMA=; b=isq9Tlq/BDF7sgHnyb+2+MdllL6shH8uTduQOoQSXlHg/Krq5LB3uKNP87CJc5mTfh KvgzI9DL+uf2LTIuBcKVF4zkPqhUrjJWALTMFjtYm1hKg3aSgu+Sm003k0n4l04nChkP Sm8KWlPVHJ5u2H3YzHbJP3nC6JGyz/HH/B9J3Kps/FkXZMAKsr4j2W06R8ylomdk9AQ1 fne/au4wD2eAMACyRW0fJyR76+iR4Qv1HAFFnk5m+3ofsGjq7nnWSdMv7Af9OHxJDifm ILJEBMsd9dy1I0GkiO38YK9ERWQzcuSW67tLfc/2HgQay+ZCgj7oE79MxEI02/Oe7hyq Vo2g== 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 k190-20020a6384c7000000b00553b54585eesi9847079pgd.245.2023.06.28.21.02.58; Wed, 28 Jun 2023 21:03:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231245AbjF2EAK (ORCPT + 99 others); Thu, 29 Jun 2023 00:00:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231140AbjF2D7x (ORCPT ); Wed, 28 Jun 2023 23:59:53 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD2222D4E; Wed, 28 Jun 2023 20:59:51 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Qs4Tb4nSNz4f3lY4; Thu, 29 Jun 2023 11:59:47 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quiwAZ1kw6DMMg--.26995S4; Thu, 29 Jun 2023 11:59:48 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 02/13] ext4: add missed brelse in update_backups Date: Thu, 29 Jun 2023 20:00:33 +0800 Message-Id: <20230629120044.1261968-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230629120044.1261968-1-shikemeng@huaweicloud.com> References: <20230629120044.1261968-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quiwAZ1kw6DMMg--.26995S4 X-Coremail-Antispam: 1UD129KBjvdXoWrZr43XF13ZryDZr1rGr45KFg_yoW3Jrc_Wa 4xAr4kXrs3Jr1SkF15Z3Wrtr48Kr48XF1ruFWUKFyrWF1jyayrZF4qv39xCr1q93WjqF45 urn7XryxJ3ySgjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbfxYFVCjjxCrM7AC8VAFwI0_Gr0_Xr1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r15M28IrcIa0xkI8VCY1x0267AKxVWUCVW8JwA2ocxC64kI II0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7 xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2 z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4 xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v2 6r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwI xGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480 Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7 IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k2 6cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxV AFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07j-BMNUUUUU= 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, KHOP_HELO_FCRDNS,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1770008232110993935?= X-GMAIL-MSGID: =?utf-8?q?1770008232110993935?= add missed brelse in update_backups Signed-off-by: Kemeng Shi --- fs/ext4/resize.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 87cd5b07a970..7cbc695b7005 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -1191,8 +1191,10 @@ static void update_backups(struct super_block *sb, sector_t blk_off, char *data, ext4_group_first_block_no(sb, group)); BUFFER_TRACE(bh, "get_write_access"); if ((err = ext4_journal_get_write_access(handle, sb, bh, - EXT4_JTR_NONE))) + EXT4_JTR_NONE))) { + brelse(bh); break; + } lock_buffer(bh); memcpy(bh->b_data, data, size); if (rest) From patchwork Thu Jun 29 12:00:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 114148 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9384246vqr; Wed, 28 Jun 2023 21:16:26 -0700 (PDT) X-Google-Smtp-Source: APBJJlHn/GRq/6XGO0hx+bShxqPQ2NW8gz6d9h4a1zXA8T6brLwEnyx/1iL/URSApIEwFJ3DbpDk X-Received: by 2002:a17:902:b188:b0:1b8:4e00:96b with SMTP id s8-20020a170902b18800b001b84e00096bmr1809375plr.9.1688012186728; Wed, 28 Jun 2023 21:16:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688012186; cv=none; d=google.com; s=arc-20160816; b=UgXkTIgh0OeNJD+pW89IV2qF83XXakQjOK8QeqovEu43gdkiLJvb7Ze8E0o+uWmR/e XAM/m6p0GXDsok5/0ZItAC4Wuf4ps1geFPB0ubzx2AYf3SLSgpM45NDMiQx+xpTiwl+r B2/9D0Un2YO7uPpY2vHLbV8mduNDNfjUT+ZPrh5+j6VF5TbA1FICwD8Ehkk8SIPugsdi /7BZ7INVFYb9icUp9OZRrMp9RsmGJig+s1m8h7vy7LwBllOBzaKktp28x0binKSs/ghz BPoCcqshStYryf44VxOZkkMUVB8nCcMu8R3nAAzKDXDCrPXMnMx474/vlQ0aCfVZ76A3 BF9A== 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=emaUCRACCxEVNxZstR3iRPtabQ6junOfulSTF+1zEQ0=; fh=eu2llfKjKKC0QBUtW6YWJ13du6subP7SB8ZN6DjSWMA=; b=PWJQwDMeriW5oLgYPNTyoVAz0/4bG9nvWLQLl3e7Nfl3W0eb9FHF8yVNdGtBVM9ovS kKMHPXmh3EJASa8K2gFMs0ZizY9ECBMzXZeqoGWARoQtjB7vdH8BCS2+1tGXRef6hq3W QQWQho0qi+aiPuXM76riGlKeoc/HE1/NsUB0koCoxRDpwmftTJKNks6b5jPwAobBsAIv Wvoa4e1+P9coFWIHcCYyrAPQS8FzRF+8a8XTW1SilCKlajsxOIBZzuHYuORbZnrB1wTf 4OYTTc+Jgab/zQpve155DGWkBMRe9tjjjuVp8LO7/sABFbE+Bav3RDgHYHkduDWkuLgA PxlA== 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 u9-20020a17090282c900b001b7f9bf117dsi7547187plz.7.2023.06.28.21.16.11; Wed, 28 Jun 2023 21:16:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232049AbjF2EAW (ORCPT + 99 others); Thu, 29 Jun 2023 00:00:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231169AbjF2D7x (ORCPT ); Wed, 28 Jun 2023 23:59:53 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD0B22724; Wed, 28 Jun 2023 20:59:51 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Qs4Tb6kvvz4f3m7r; Thu, 29 Jun 2023 11:59:47 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quiwAZ1kw6DMMg--.26995S5; Thu, 29 Jun 2023 11:59:48 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 03/13] ext4: correct return value of ext4_convert_meta_bg Date: Thu, 29 Jun 2023 20:00:34 +0800 Message-Id: <20230629120044.1261968-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230629120044.1261968-1-shikemeng@huaweicloud.com> References: <20230629120044.1261968-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quiwAZ1kw6DMMg--.26995S5 X-Coremail-Antispam: 1UD129KBjvdXoW5KFyDXFy3KFW8tr1fCry3Arb_yoWxWrg_Ca 42yry7X39xXrnakayfAw1aqw4F93W0qr1rua95tFyUWF1jya1UJw4kZrWxCr1UuF1jkFnx C3Z5Xr9rJF1Y9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbfxYFVCjjxCrM7AC8VAFwI0_Xr0_Wr1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r1rM28IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC64kI II0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7 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, KHOP_HELO_FCRDNS,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1770009067084519569?= X-GMAIL-MSGID: =?utf-8?q?1770009067084519569?= We return error in "ret", so collect previous error in "ret" instead of "err" or previous error will be ignored. Signed-off-by: Kemeng Shi --- fs/ext4/resize.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 7cbc695b7005..0b3d8c808de1 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -1984,8 +1984,8 @@ static int ext4_convert_meta_bg(struct super_block *sb, struct inode *inode) errout: ret = ext4_journal_stop(handle); - if (!err) - err = ret; + if (!ret) + ret = err; return ret; invalid_resize_inode: From patchwork Thu Jun 29 12:00:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 114145 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9380263vqr; Wed, 28 Jun 2023 21:06:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5g4duVTL9tODQgP56vrr+StpG9TRDCK6IJ8s+WZ1FmdX18eC40AbUNYkXDYWPK2jtRouvC X-Received: by 2002:a17:90a:7527:b0:25d:eca9:1621 with SMTP id q36-20020a17090a752700b0025deca91621mr26286328pjk.6.1688011573941; Wed, 28 Jun 2023 21:06:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688011573; cv=none; d=google.com; s=arc-20160816; b=0Gpr4hwdSB2KlbDn2whw1tTReLtxwn0aum/YjdbXE/AxL24RRjgHocTIq1jcESYW1U vy9bJtthcYRZWhAhRMHV327/2Gs5kSCbw8F+DkAkTy1HV44ty9PBDACaTO4wGQ2Zsbn6 NUZoDPlPzTC08Ns6oDr/IByRDTdQJsmk+l6l09U73/CBfXzP57sv6xj09D/w0tBmvP6Z cfyAx0rihP9ah33+Io0QDFR26F0xOWlJv137ZDlnMnQ/eFcrB8LBdRQF6QnDj5PXHCFj Ek5GY6yQ6IrOijCvBbv8ICdj6SFYr3wB4ABhUcfAA7NiHoRHay0Adp4nJ6tq5NeFzFox E6Hg== 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=CRGTWl3y7QbAH/oRTnz3CcMJPCu+vzqbKfwKsoiJIq4=; fh=eu2llfKjKKC0QBUtW6YWJ13du6subP7SB8ZN6DjSWMA=; b=J6QHthwIyX+rvOF7qmkG1sxMAJ9+tUPD5fZkX29DoALRmrGlSoiwYsnyZOqeQYTmjS i9j1ufk81mfgdWvnf/quLTiCCu2Nxm+EumK2QeIhoLWKnpDQ/c6o4ZtJulNBLhnES7Sv oxO64jQVmK33QT0aZMzkg6yeujuUPAIGbCaa+Ik8FgiVIQ6tOB9zLsU0eYu4pFcTLiNZ 06fygZw44YD7DZ2El7Xa8LHced7Sz1zjPRU9NKnMQMJP/xT8mpVqKHa/38tfqeUXXFjg pqNvNNNjxjg1zLaLirffrZEUaW9SmDsCN+IUhE8pYbDjCxPbV6in7gLCZR8RIk51N4Mr sKZw== 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 j4-20020a170903028400b001ae014d8d03si10179933plr.432.2023.06.28.21.06.00; Wed, 28 Jun 2023 21:06:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232085AbjF2EA2 (ORCPT + 99 others); Thu, 29 Jun 2023 00:00:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231249AbjF2D7x (ORCPT ); Wed, 28 Jun 2023 23:59:53 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA46F2D50; Wed, 28 Jun 2023 20:59:51 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Qs4Tc1XrTz4f3vqZ; Thu, 29 Jun 2023 11:59:48 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quiwAZ1kw6DMMg--.26995S6; Thu, 29 Jun 2023 11:59:48 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/13] ext4: remove gdb backup copy for meta bg in setup_new_flex_group_blocks Date: Thu, 29 Jun 2023 20:00:35 +0800 Message-Id: <20230629120044.1261968-5-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230629120044.1261968-1-shikemeng@huaweicloud.com> References: <20230629120044.1261968-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quiwAZ1kw6DMMg--.26995S6 X-Coremail-Antispam: 1UD129KBjvJXoW7AF4xWrWxJFy5tFWDZrWDJwb_yoW8CFW3pr s3C3W5GFWUGrWjga18A392gF1kGw4xGr48trW5Ga1xGrW3X3WkWryqqF1IyFW5KFZIqrn2 q3Z8ZFy2yw17C3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB2b4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJw A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6x kF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU3XTQUUUUU 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, KHOP_HELO_FCRDNS,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1770008423975064372?= X-GMAIL-MSGID: =?utf-8?q?1770008423975064372?= Wrong check of gdb backup in meta bg as following: first_group is the first group of meta_bg which contains target group, so target group is always >= first_group. We check if target group has gdb backup by comparing first_group with [group + 1] and [group + EXT4_DESC_PER_BLOCK(sb) - 1]. As group >= first_group, then [group + N] is > first_group. So no copy of gdb backup in meta bg is done in setup_new_flex_group_blocks. No need to do gdb backup copy in meta bg from setup_new_flex_group_blocks as we always copy updated gdb block to backups at end of ext4_flex_group_add as following: ext4_flex_group_add /* no gdb backup copy for meta bg any more */ setup_new_flex_group_blocks /* update current group number */ ext4_update_super sbi->s_groups_count += flex_gd->count; /* * if group in meta bg contains backup is added, the primary gdb block * of the meta bg will be copy to backup in new added group here. */ for (; gdb_num <= gdb_num_end; gdb_num++) update_backups(...) In summary, we can remove wrong gdb backup copy code in setup_new_flex_group_blocks. Signed-off-by: Kemeng Shi --- fs/ext4/resize.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 0b3d8c808de1..0e83b3f91545 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -560,13 +560,8 @@ static int setup_new_flex_group_blocks(struct super_block *sb, if (meta_bg == 0 && !ext4_bg_has_super(sb, group)) goto handle_itb; - if (meta_bg == 1) { - ext4_group_t first_group; - first_group = ext4_meta_bg_first_group(sb, group); - if (first_group != group + 1 && - first_group != group + EXT4_DESC_PER_BLOCK(sb) - 1) - goto handle_itb; - } + if (meta_bg == 1) + goto handle_itb; block = start + ext4_bg_has_super(sb, group); /* Copy all of the GDT blocks into the backup in this group */ From patchwork Thu Jun 29 12:00:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 114146 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9381510vqr; Wed, 28 Jun 2023 21:09:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5Jz2zdR7G6dgiylSGGi1lAJomikjdTOph0+5C9lp/qbEDqPNbmfDiEGjoJS1LzbcvbAzCO X-Received: by 2002:a05:620a:390b:b0:75b:23a0:deb7 with SMTP id qr11-20020a05620a390b00b0075b23a0deb7mr40384357qkn.53.1688011750680; Wed, 28 Jun 2023 21:09:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688011750; cv=none; d=google.com; s=arc-20160816; b=ou8bwTPBpqWplTPuLMypSJv89uui+JFB8G+BnVORDVW6JC/5NrtBwkZFBXhO8Si6I/ YCNf2z6RBrq9O8Ey5plN3+c4tVlAk0iKA8ra9nCcAUITI8gU7vcsZzdMhomNpzMT/wIY FtnNh4OztTqRueWQO/FRegaJjnVG38DeSBhIskciucIsvOx3djB6AnGpQ6E2wzrFNMLR cU2vOBezGX6H74owOv+silwI8lvThMc6NOUXeG2zqf2e3IsrH0Y72mfNr5TfZMWYzt8n xeucT9wJFj6VUIiYDXAMDfDTn1VOIsz6iTf/tuI2fZWBs19bMbs17DSjWwqNg0SusDgI srqg== 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=HlpIZoa9Yj/5t1MbFWi/4mxNGeQl8pnxIoCI6ZQDgM8=; fh=eu2llfKjKKC0QBUtW6YWJ13du6subP7SB8ZN6DjSWMA=; b=iGW8tt4wgAtKtjauzz+Ja1Pysa0iN4QMPnA3wWyBlHbWUj/uxz+mKI7xwZzCzPMrVz are+dBCzv/EoYtSPg9j50QyxX3XlMCpyfbqpay1eqZMZQLCOwxV2fBCqaYZVUNpaqDdX HV94a0Hfd7/HslVgRpt6NmTIJm59xzVlDy9qxBcrb09g0maYoufT1c8SfDVB73wD7DbO oBeLhqG15DL0yejCAQG9sdVmG9iXm0Z2jAIGz0csaNs1VUJTomr2RB09anYQigEz6Wzq fsr7a1hK9SLJsjNZJ738z8ylsdzP3Jzaax3BfGoMT36t+u/rfbz/NjOpi+xjLKUKp/qM UiDQ== 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 c15-20020a17090a558f00b0023a177c4951si10355993pji.39.2023.06.28.21.08.58; Wed, 28 Jun 2023 21:09:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232134AbjF2EAj (ORCPT + 99 others); Thu, 29 Jun 2023 00:00:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231615AbjF2D7y (ORCPT ); Wed, 28 Jun 2023 23:59:54 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D12812D51; Wed, 28 Jun 2023 20:59:51 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Qs4Tc377kz4f3vrC; Thu, 29 Jun 2023 11:59:48 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quiwAZ1kw6DMMg--.26995S7; Thu, 29 Jun 2023 11:59:49 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/13] ext4: fix typo in setup_new_flex_group_blocks Date: Thu, 29 Jun 2023 20:00:36 +0800 Message-Id: <20230629120044.1261968-6-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230629120044.1261968-1-shikemeng@huaweicloud.com> References: <20230629120044.1261968-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quiwAZ1kw6DMMg--.26995S7 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYA7kC6x804xWl14x267AKxVWrJVCq3wAF c2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62 vIxIIY0VWUZVW8XwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E 14v26r4j6ryUM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI 8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vE x4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzx vE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWU JVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7V AKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr 1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IUnr9NDUU UUU== 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, KHOP_HELO_FCRDNS,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1770008609720960323?= X-GMAIL-MSGID: =?utf-8?q?1770008609720960323?= grop -> group Signed-off-by: Kemeng Shi --- fs/ext4/resize.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 0e83b3f91545..f2a8c24a6fbb 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -609,7 +609,7 @@ static int setup_new_flex_group_blocks(struct super_block *sb, } handle_itb: - /* Initialize group tables of the grop @group */ + /* Initialize group tables of the group @group */ if (!(bg_flags[i] & EXT4_BG_INODE_ZEROED)) goto handle_bb; From patchwork Thu Jun 29 12:00:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 114154 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9390355vqr; Wed, 28 Jun 2023 21:33:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6Ja/AaVUp5XzrNdTa2vjZ59WTxuaata8EozygQxaaOl6Uz/V+m4KUWpAfSCb6s82t1PguR X-Received: by 2002:a05:6a00:1a01:b0:65e:1d92:c0cc with SMTP id g1-20020a056a001a0100b0065e1d92c0ccmr4353619pfv.10.1688013235552; Wed, 28 Jun 2023 21:33:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688013235; cv=none; d=google.com; s=arc-20160816; b=vOh/V/7BvGhLUrasxbcWhxT8Zbki/ZBc+WjPk9+ztopOUB3qfS+0AJSHM6LlVf7gEC JEYX4sQ9nEjB+TkceZ91OmUSMzUaWWFiHJhRPEuRdiCVvP4hJcOZXW2Eyfti1mfrh8xn QmnnGb3rqftN61kP9p3V0UXZBsrc1BavrBDAFgtz2U4GRnbtzEGE/YVVvWXGXhLNiI7q YLaiBQ40L9urQTilrnehcLRE7vlfKlN9ZUftUAIHCosF9jb6ge7NgDGYKFSr+Wn8yGVy TUfHNYHlIx9pLYiwRt22iqfD21wMseYQ9QJXeRFkAk3UzSHZpf9vCHs6xMTHuxcKVe85 aIYQ== 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=CEJigJ5ecgFnCueHPLGU92MJ9ARrjERpVi8aJclPD4w=; fh=eu2llfKjKKC0QBUtW6YWJ13du6subP7SB8ZN6DjSWMA=; b=GlddoLtZW08vVqiJq7lCE1l3/TAppoI9XWodMrGZ1o/mI5+9ZqaJHV7dSrP7B2Tqeb gWBamrWg4IJ9o3iyiLZeVVU/2MFRW5YInSsSKWI2GgQfsirUAeXArBbvIe2UbKvdXbj/ cKukkM5Iiabi6lzMRt8IOv9uEv8LNofmv9sEsMCVuVlb3xPFT0Noe8gGQw09mH/7zfgp DOQgxKANPzwkIyfU1Y9QZtzhNiLjHunTBs6XkVcvh8qK4MWdH5TkKpOOt6vuiZ3qTFO3 QkIeiRXzw2yNlvGRpMpUGKcRYAT8EtynlgLBOSvnGMoIpaDBzhRF96TUCxvdJEF5JqC7 8urw== 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 y32-20020a056a00182000b0066686266a52si8230670pfa.8.2023.06.28.21.33.43; Wed, 28 Jun 2023 21:33:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231961AbjF2EAy (ORCPT + 99 others); Thu, 29 Jun 2023 00:00:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231637AbjF2D7y (ORCPT ); Wed, 28 Jun 2023 23:59:54 -0400 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E37322D52; Wed, 28 Jun 2023 20:59:51 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4Qs4Tb2mmQz4f3s5v; Thu, 29 Jun 2023 11:59:47 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quiwAZ1kw6DMMg--.26995S8; Thu, 29 Jun 2023 11:59:49 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/13] ext4: remove redundant check of count Date: Thu, 29 Jun 2023 20:00:37 +0800 Message-Id: <20230629120044.1261968-7-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230629120044.1261968-1-shikemeng@huaweicloud.com> References: <20230629120044.1261968-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quiwAZ1kw6DMMg--.26995S8 X-Coremail-Antispam: 1UD129KBjvdXoWrZw45Xw18Zr4DKFWDCry7GFg_yoW3Crc_Ka 47Cr1kurWfJrySkF9rtw1Fyw4FyF4vyr1rGFWfJFW8uF15A3y8X3yqqrW8ur48Wa1UJasx u3s5tr1fK3WFqjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbS8YFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM2 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, KHOP_HELO_FCRDNS,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1770010166465142562?= X-GMAIL-MSGID: =?utf-8?q?1770010166465142562?= Remove zero check of count which is always non-zero. Signed-off-by: Kemeng Shi --- fs/ext4/resize.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index f2a8c24a6fbb..c14b09d48679 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -699,16 +699,14 @@ static int setup_new_flex_group_blocks(struct super_block *sb, block = start; } - if (count) { - err = set_flexbg_block_bitmap(sb, handle, - flex_gd, - EXT4_B2C(sbi, start), - EXT4_B2C(sbi, - start + count - - 1)); - if (err) - goto out; - } + err = set_flexbg_block_bitmap(sb, handle, + flex_gd, + EXT4_B2C(sbi, start), + EXT4_B2C(sbi, + start + count + - 1)); + if (err) + goto out; } out: From patchwork Thu Jun 29 12:00:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 114151 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9389448vqr; Wed, 28 Jun 2023 21:31:26 -0700 (PDT) X-Google-Smtp-Source: APBJJlGFi68tBEFJz208DLAwz+kOsPHyK2+5jmBWGMNxnbOA/i3TlWC9/eYlW9g2FTbqGyp4NRwT X-Received: by 2002:a05:6358:cb2f:b0:134:e413:4d3 with SMTP id gr47-20020a056358cb2f00b00134e41304d3mr2543451rwb.16.1688013085877; Wed, 28 Jun 2023 21:31:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688013085; cv=none; d=google.com; s=arc-20160816; b=scAcmR7D0GVa+9qiY7w8kZmOj7Q1paoC1neEfpwU8O9Mf4BKtrsjNAk4WW5M+M1wB3 X51mfIGoChLrKbITIsBh/p1ieuohvb9XamJakJqfEXAoyFB24XgQYgnk1VXHg0v8kh2H QRVxGu6jovpaZBSxfQSQYG8f1TbHexlYwXyKO5DeTsqJIe5IXFm1QHLa1vB0qSAon5kt JSepGYlXURlkmdejfPHx3ZXdmMIyOm+jIXNUo9DoGYyLSC+ueQYIsjpWDxzb9NdjwRFq u41xVOF2sl3cdZ3wcCUnJ2apSZ1SYC8TMxKnTkkFX1zsDHIS4KmRQaoeN3Tl4NVkSIoJ FB9Q== 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=NrP+IXOrdgrnffAFou7qGn6/2UT5oaXYpx+TZtKn5eE=; fh=eu2llfKjKKC0QBUtW6YWJ13du6subP7SB8ZN6DjSWMA=; b=tCuDvc/HNVpmjPmOe5AbqoYbjjGZMVOdyud+GSQWXhnQdefj+vi/zICYZMw7QkxLgj HBxRQ+ebGcmmJIuaA64YB8e9UUz9Jcry67npEzzfswgbJF8f+s88C08S7elZ8NSOiEgl qGIy1wtTU0eApm4crlgDg9AS/yA+4avluIssNfFbIlfUL/cNiGV+eMYj4iR8voOxPxdg Uq1PFVcyI1AXwR7i7g37ZUPsJHrZgIWCBm8DW+pJ8tDu58KyfBlFoiaugPqCgNfwZ42a YjZdM1SrehM+2nB+xok+yNPWJoYzzwJPiQ1ww/0sPYCoJrYxKSaKFTUizhiXtlxytZIB /pRg== 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 t11-20020a170902d14b00b001aae905065csi9295700plt.284.2023.06.28.21.31.10; Wed, 28 Jun 2023 21:31:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230314AbjF2EAt (ORCPT + 99 others); Thu, 29 Jun 2023 00:00:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231731AbjF2D7y (ORCPT ); Wed, 28 Jun 2023 23:59:54 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A28A2D55; Wed, 28 Jun 2023 20:59:52 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Qs4Tc6ssVz4f48kM; Thu, 29 Jun 2023 11:59:48 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quiwAZ1kw6DMMg--.26995S9; Thu, 29 Jun 2023 11:59:49 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 07/13] ext4: remove commented code in reserve_backup_gdb Date: Thu, 29 Jun 2023 20:00:38 +0800 Message-Id: <20230629120044.1261968-8-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230629120044.1261968-1-shikemeng@huaweicloud.com> References: <20230629120044.1261968-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quiwAZ1kw6DMMg--.26995S9 X-Coremail-Antispam: 1UD129KBjvdXoWrZF4Uur1rtr4Dur1fJFWkZwb_yoW3ArXEqa srCr4kX3yrurn5CFyxWr1Sy3yv9r1Fyrn5uay3trn3u3W0yFZ5A3yDXwsxCryUuF4ayw45 uF1vv3sIyay0gjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbS8YFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM2 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, KHOP_HELO_FCRDNS,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1770010009858666372?= X-GMAIL-MSGID: =?utf-8?q?1770010009858666372?= Remove commented code in reserve_backup_gdb Signed-off-by: Kemeng Shi --- fs/ext4/resize.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index c14b09d48679..07828903b818 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -1080,9 +1080,6 @@ static int reserve_backup_gdb(handle_t *handle, struct inode *inode, for (i = 0; i < reserved_gdb; i++) { int err2; data = (__le32 *)primary[i]->b_data; - /* printk("reserving backup %lu[%u] = %lu\n", - primary[i]->b_blocknr, gdbackups, - blk + primary[i]->b_blocknr); */ data[gdbackups] = cpu_to_le32(blk + primary[i]->b_blocknr); err2 = ext4_handle_dirty_metadata(handle, NULL, primary[i]); if (!err) From patchwork Thu Jun 29 12:00:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 114149 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9384425vqr; Wed, 28 Jun 2023 21:16:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7FDCxqQe6Mop5n34aSQcqQboJdXeAXvlFCdKWzYBUxvVcEuEmcpmh3PQQZLDff+Lap8fc2 X-Received: by 2002:a05:620a:284b:b0:765:cb87:59ca with SMTP id h11-20020a05620a284b00b00765cb8759camr11231923qkp.74.1688012216290; Wed, 28 Jun 2023 21:16:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688012216; cv=none; d=google.com; s=arc-20160816; b=D9LyfYTDgSwD0obmhTvFyt06tj5ssXgcoMhrzylvHyetUWbLm0NnvOJUSN30Unl5gA sIDw9tv25Nqr+Vnyhceqad0OZWEZnskx3sCh4ZBttJ9iuYrNTm+Rs8ad52b2V9iERWeU sX+kgSKXknOS3EoVt4umjyW48XHVXGrchyrX0ZPuBto2nBZlX1ETVDofbfOkHX9kPdiu P94dpj/oEOUesOcqL2w3VkbuT9syn7u+1gsw2T6vn1ocIjB/ICgrpibjBEmDh0UpCmkP 7D97EN6F9O1FXKGETc7EGl99tMLT/XCx21TeXKUV0WrCxKldbNuGHy0h2uT1s6FiCaCU pfMQ== 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=tsLxwLJ5A+FBTciJRlHsguXV+gN3hl2XPUN5LAV4SOs=; fh=eu2llfKjKKC0QBUtW6YWJ13du6subP7SB8ZN6DjSWMA=; b=zEHRLfvkKNLNXjwuTBmCSzf7TmYD1rfzy8jA0Xxih0ZTTkujdzNNIcws0oUQQiagbI dS0nGsTQXBd9eYqZZjZdeqh9nbGVeTQ7ZqUkGb0G9ePmE6kRhVqm7uFz7U7Nv2jIL2dF DVJWc4nO4e0gEYJOjD9tZH/MuCKoVZKGIEmpEnTwO6XoFDMmXpQdGQ5KfsuSfuTRmCsd akwRNRsQmJl8dyYCENoYxMQ9TaT9k6Y0h1Vhbtic39IKV5j58c5RjSAE0j3D1J0+WovM e51pd+M8RtQ9gNr0nax92Fvn739q///aYew7nCXKK11uV1wyDeN/9LR/zIIx+/kbtmOI chDw== 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 kb15-20020a17090ae7cf00b00262fa96d9e6si7200841pjb.142.2023.06.28.21.16.41; Wed, 28 Jun 2023 21:16:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232384AbjF2EB0 (ORCPT + 99 others); Thu, 29 Jun 2023 00:01:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231882AbjF2D7z (ORCPT ); Wed, 28 Jun 2023 23:59:55 -0400 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B5832D56; Wed, 28 Jun 2023 20:59:52 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4Qs4Tb6XTkz4f3mLh; Thu, 29 Jun 2023 11:59:47 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quiwAZ1kw6DMMg--.26995S10; Thu, 29 Jun 2023 11:59:49 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 08/13] ext4: calculate free_clusters_count in cluster unit in verify_group_input Date: Thu, 29 Jun 2023 20:00:39 +0800 Message-Id: <20230629120044.1261968-9-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230629120044.1261968-1-shikemeng@huaweicloud.com> References: <20230629120044.1261968-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quiwAZ1kw6DMMg--.26995S10 X-Coremail-Antispam: 1UD129KBjvJXoW7Kw15urWxtrWfXFWUKw4kJFb_yoW8JFy8pr Z3AFnxKryrWr1UWa13J34qqr1rWw4kKF15WFyUWryxAF9rWa4fArn0yr1Yv3W5Kan7JF9r X3ZIgry7CF1Dua7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB2b4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJw 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, KHOP_HELO_FCRDNS,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1770009097236575076?= X-GMAIL-MSGID: =?utf-8?q?1770009097236575076?= We treat free_clusters_count in cluster unit while free_blocks_count is in block unit. Convert free_blocks_count to cluster unit to match the unit. Currently, verify_group_input is only called from ext4_ioctl_group_add which does not support bigalloc yet. The dismatch is easily ingored when we try to support bigalloc in ext4_ioctl_group_add (ext4_resize_fs already supports resize with bigalloc enabled). Just fix this in advance. Signed-off-by: Kemeng Shi Reviewed-by: Theodore Ts'o --- fs/ext4/resize.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 07828903b818..c532bb613043 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -154,8 +154,9 @@ static int verify_group_input(struct super_block *sb, overhead = ext4_group_overhead_blocks(sb, group); metaend = start + overhead; - input->free_clusters_count = free_blocks_count = - input->blocks_count - 2 - overhead - sbi->s_itb_per_group; + free_blocks_count = input->blocks_count - 2 - overhead - + sbi->s_itb_per_group; + input->free_clusters_count = EXT4_B2C(sbi, free_blocks_count); if (test_opt(sb, DEBUG)) printk(KERN_DEBUG "EXT4-fs: adding %s group %u: %u blocks " From patchwork Thu Jun 29 12:00:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 114153 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9389655vqr; Wed, 28 Jun 2023 21:32:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7m2Kl5hzn2Kxl3ljMg5JLmvNQ21neNyFzQZjwvJthN7t2jxp/45qb2TSYRJeyHkiae/5c5 X-Received: by 2002:a05:6808:1495:b0:3a3:6c66:4393 with SMTP id e21-20020a056808149500b003a36c664393mr3462668oiw.33.1688013123903; Wed, 28 Jun 2023 21:32:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688013123; cv=none; d=google.com; s=arc-20160816; b=ZaFYvQvE/0wyQgXsFS05jEjL4iFpXBVae84LTDV4XPzrl0xgdzoWBZo6OTApuzSgxH LZco21RMR6ZVh7jeDslD9vhK08tJsuEfkqZvH6NC4EMXqGOQreQlgDDKEg/nZptJlEkd WiX8zf3e3Ok+xUeYYoat2XPy8XlTQrzWtiXH7SEwOCvZPKKJWQBzb1gfpExub10UXn2P RnFbC4OCFDv2EehkeNcyrwcYdgqntUTe/KOi/4dDoCqoz8Wp3eD+Hh69uOwJRLzDStoc vbldgo9/ASubqx+Ias7DQ7QY+OONpW5ZNlFePJQm+86pj8HXHZZiCAY6XgXjd7wjBugq af6w== 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=JPdQpsMEZ2SgeolVpZX2IgVJrbKJA594vLdEK6rVZGU=; fh=eu2llfKjKKC0QBUtW6YWJ13du6subP7SB8ZN6DjSWMA=; b=nQVGh/vzW5ADgy72Hl4FI2Lr7sdt6R9lJf1d6st5bZMPnP4VNu4QPcJfMtNeSwHn6M l7IIBeZMuwXBzJvzHXWlpgY/5CfHG4Lc1fxl3H9o+Sf0NabBCgUNrR+DIhCjMdEA2210 K8AqkEzk4BNbtz9YPverNXurdgoyNIzeAr2U0zPshbNLVMCx8hOyPN4BJ1hPNrDY19o4 y2W0EjGrAbJKEsUiOdmlnKpQ0EWXPcIwg7r/Y2BtRX81x7DeBdW6pUAiAeVb4WsV/I9X vhhSt5T+Hg9IjkL5GZo1O0BIYBQIwX44L97kPWm3KKualnPhHbjHFv/4iIuPQyZTT/Et cwUw== 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 h184-20020a6383c1000000b005533db5fbacsi9928129pge.451.2023.06.28.21.31.51; Wed, 28 Jun 2023 21:32:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232357AbjF2EBT (ORCPT + 99 others); Thu, 29 Jun 2023 00:01:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231861AbjF2D7z (ORCPT ); Wed, 28 Jun 2023 23:59:55 -0400 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E62C2D5B; Wed, 28 Jun 2023 20:59:53 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4Qs4Tc1gJvz4f3mLj; Thu, 29 Jun 2023 11:59:48 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quiwAZ1kw6DMMg--.26995S11; Thu, 29 Jun 2023 11:59:50 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 09/13] ext4: remove EXT4FS_DEBUG defination in resize.c Date: Thu, 29 Jun 2023 20:00:40 +0800 Message-Id: <20230629120044.1261968-10-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230629120044.1261968-1-shikemeng@huaweicloud.com> References: <20230629120044.1261968-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quiwAZ1kw6DMMg--.26995S11 X-Coremail-Antispam: 1UD129KBjvdXoW7Jr1fAF17XF47XryUZw4fZrb_yoW3XFg_Kw s7Ar48WFWfXw1xKa4xAr4kt3ZYgF18Gr15ZayfGw15WF1jvw4rGws2qr4DCwn8uF4UtwnY k3WkJFnxXF1FgjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbS8YFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM2 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, KHOP_HELO_FCRDNS,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1770010049289473505?= X-GMAIL-MSGID: =?utf-8?q?1770010049289473505?= Remove EXT4FS_DEBUG defination in resize.c for following reasons: 1. EXT4FS_DEBUG will enable debug messages, it should only be defined when debugging. 2. ext4.h included from ext4_jbd2.h after EXT4FS_DEBUG defination will "#undef EXT4FS_DEBUG", then EXT4FS_DEBUG defination in resize.c can't actually turn on ext4_debug messages. Signed-off-by: Kemeng Shi --- fs/ext4/resize.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index c532bb613043..686eee65c118 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -10,8 +10,6 @@ */ -#define EXT4FS_DEBUG - #include #include #include From patchwork Thu Jun 29 12:00:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 114155 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9390724vqr; Wed, 28 Jun 2023 21:34:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ42WvkBGzW0fiDnW6nzAVzkw3VtH5eboqKek0xbMUMxVrT8DNnVmtjMC8VTZe3qR4cyzFsc X-Received: by 2002:a05:6a20:8e22:b0:12c:55:b183 with SMTP id y34-20020a056a208e2200b0012c0055b183mr5623789pzj.55.1688013295706; Wed, 28 Jun 2023 21:34:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688013295; cv=none; d=google.com; s=arc-20160816; b=Y917S/y35cg8qLfNIGZrTxrxNXNEaUE/fDRIHzifVOFe78oWQ7DkvudBhhYnWxrx9U s6B/FJAZeTUyArsCxeLjXijAWLuSH3dPcP6f1OR1fDivZOB/vGzXLhFwfS6Lvcvs4opF VbE1tCUg+/TJBkjV4nDhOnuJ+JfOqoUaZwqEzfIe6VbSs+MpRLLmao3ViLyHIpeiGqRG 2WEoCj23bR/AAWgzRXDZgEaeWrkj3yl2xQ2Jk4L0owXVyJPRFNzROJoVNEQ8KSWQg1G+ uta8o55BgBSbpFN1GUfW9qRvXQ43WcLGf36jvtwXJMPZXVLgSuqZ0mRC7hl3kR9ZAaSg MMzw== 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=ejgR0e7nsKZB32HDMutnDaAoxiNkrKzEyYfunA+Ymkg=; fh=eu2llfKjKKC0QBUtW6YWJ13du6subP7SB8ZN6DjSWMA=; b=sJLGbshhAMzRU7rTvJaOiBtKg6jK2ac1HaopihyKnQMK9qtd/piSYq6EtuR0I32PJg CrHafC5hxbqPwLth9ufIEM3d0NLRYW8BktAz02p/+X1JxpNfdREn2/i1b5g+a02OLsTg ydCHIPs8WrszsTVZInDvg5aV6JyozGpdNZhM0ItmGqASX/25JSGCecDCoowphtCUQW0y w7oFledPJGvSBLl+ffpjB0Szriqy3cISG60SUJorfG/MeqkG4/uhc6852S6fEdWi4EdS H5q4qlIMWBTK8JR3edZrlnaTIJB3w1OzPxNs+tSBqhGyOzQyDh40Q+La2H9k1IHogeZF pZsA== 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 bq9-20020a056a000e0900b006813b381be3si2127506pfb.41.2023.06.28.21.34.40; Wed, 28 Jun 2023 21:34:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232342AbjF2EBP (ORCPT + 99 others); Thu, 29 Jun 2023 00:01:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231905AbjF2D7z (ORCPT ); Wed, 28 Jun 2023 23:59:55 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2918D2D60; Wed, 28 Jun 2023 20:59:53 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Qs4Td4x4vz4f3m8L; Thu, 29 Jun 2023 11:59:49 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quiwAZ1kw6DMMg--.26995S12; Thu, 29 Jun 2023 11:59:50 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 10/13] ext4: use saved local variable sbi instead of EXT4_SB(sb) Date: Thu, 29 Jun 2023 20:00:41 +0800 Message-Id: <20230629120044.1261968-11-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230629120044.1261968-1-shikemeng@huaweicloud.com> References: <20230629120044.1261968-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quiwAZ1kw6DMMg--.26995S12 X-Coremail-Antispam: 1UD129KBjvJXoW7WFW3Jr17XF43WFW5JrWfGrg_yoW8ZrW7pF W3AF1rGFWIkF1DuF43Grs8Xr1F9w40y3WjgFWfuFy3XrW5J3Z3CF97ta45WF4UKrZxJw1f X398KrWUAr1DX37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB2b4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJw A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_Gr0_Xr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE 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, KHOP_HELO_FCRDNS,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1770010229475518407?= X-GMAIL-MSGID: =?utf-8?q?1770010229475518407?= We save EXT4_SB(sb) to local variable sbi at beginning of function ext4_resize_begin. Use sbi directly instead of EXT4_SB(sb) to remove unnecessary pointer dereference. Signed-off-by: Kemeng Shi --- fs/ext4/resize.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 686eee65c118..b9507e432496 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -55,7 +55,7 @@ int ext4_resize_begin(struct super_block *sb) * If the reserved GDT blocks is non-zero, the resize_inode feature * should always be set. */ - if (EXT4_SB(sb)->s_es->s_reserved_gdt_blocks && + if (sbi->s_es->s_reserved_gdt_blocks && !ext4_has_feature_resize_inode(sb)) { ext4_error(sb, "resize_inode disabled but reserved GDT blocks non-zero"); return -EFSCORRUPTED; @@ -67,9 +67,9 @@ int ext4_resize_begin(struct super_block *sb) * bad time to do it anyways. */ if (EXT4_B2C(sbi, sbi->s_sbh->b_blocknr) != - le32_to_cpu(EXT4_SB(sb)->s_es->s_first_data_block)) { + le32_to_cpu(sbi->s_es->s_first_data_block)) { ext4_warning(sb, "won't resize using backup superblock at %llu", - (unsigned long long)EXT4_SB(sb)->s_sbh->b_blocknr); + (unsigned long long)sbi->s_sbh->b_blocknr); return -EPERM; } @@ -77,7 +77,7 @@ int ext4_resize_begin(struct super_block *sb) * We are not allowed to do online-resizing on a filesystem mounted * with error, because it can destroy the filesystem easily. */ - if (EXT4_SB(sb)->s_mount_state & EXT4_ERROR_FS) { + if (sbi->s_mount_state & EXT4_ERROR_FS) { ext4_warning(sb, "There are errors in the filesystem, " "so online resizing is not allowed"); return -EPERM; @@ -89,7 +89,7 @@ int ext4_resize_begin(struct super_block *sb) } if (test_and_set_bit_lock(EXT4_FLAGS_RESIZING, - &EXT4_SB(sb)->s_ext4_flags)) + &sbi->s_ext4_flags)) ret = -EBUSY; return ret; From patchwork Thu Jun 29 12:00:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 114156 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9390880vqr; Wed, 28 Jun 2023 21:35:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7LZqI7QgJavxeoB8+UTsCINNR+zJ7CUtZlnGxZ+J7yvE4s3/DvW1Q6ILOrbtSObdfNBwfM X-Received: by 2002:a05:6a00:8cc:b0:666:ae6b:c484 with SMTP id s12-20020a056a0008cc00b00666ae6bc484mr46504394pfu.13.1688013321019; Wed, 28 Jun 2023 21:35:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688013321; cv=none; d=google.com; s=arc-20160816; b=nCEb9gSVuyDWJKrw1ookbotoAH9ggOJLj9734Hn+lGCkGpN3/xRig83dklYDyq2ewN 9TtNQFCWiIgnGEX5D4VoELSTmjS/um1BfgByRpC4tM7E9ZOLziMv3aTvfya/s2jSo/rB VpD38Y48gq0m4Tr0jY5M1i4tFPZ9e6SEVSAa513k9cyEAUJRvHmm+thLUAUYwSRhcpx/ V1+M3TgeZTTD2M4qHE/y0/zRqJNCA60ABYTw7H209/C46zmoFVbjQnuzurq2kz/KLJdC 4sx3szColtAanyMUrqX0C+vk3u+dd7Z8mSjy6ucPKV4KoXiaZiG26dSRHnbRV54/HMIa KVbQ== 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=7LIixs4XM7w8DnVlqS8poFZSLLPr77lU3eR2tt94pT0=; fh=eu2llfKjKKC0QBUtW6YWJ13du6subP7SB8ZN6DjSWMA=; b=CXiz7b9MQqgoQQWi+rL0r4lkqK7JVcYs6ucBb/mGZWpTB3PSZ3pTV3S2owmUSjVNf6 thJIlE2bMOuuZbh45p/4FHFMAC/evbLA094rAXWyziw9Yzo+yWsXT0mANbsqQ8YnXuaZ t7yMzqX61K+JdhCWWsxFrGyNuvujxjkm1LQZT00NjucshMcLWa5bFpzNWLMem6o9g4d8 UJUClikdHnA5QBNlIbXAl34FIn/DenUpvBD2LR+22xRSlMJ8AmRTTVILuNSZHDqb4M9U xLs0kcm1qdzJPD4k4vJFpDHVXVDv9zYTk+Bmak4OrvhMCB6eWGXIz0Buy44P7Mf86Jiw l4bQ== 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 p38-20020a634f66000000b0055355a29740si9811266pgl.718.2023.06.28.21.35.08; Wed, 28 Jun 2023 21:35:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232271AbjF2EBE (ORCPT + 99 others); Thu, 29 Jun 2023 00:01:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231910AbjF2D7z (ORCPT ); Wed, 28 Jun 2023 23:59:55 -0400 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59E432D62; Wed, 28 Jun 2023 20:59:53 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4Qs4Tc4c2Yz4f3tDn; Thu, 29 Jun 2023 11:59:48 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quiwAZ1kw6DMMg--.26995S13; Thu, 29 Jun 2023 11:59:50 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 11/13] ext4: correct gdblock calculation in add_new_gdb_meta_bg to support non first group Date: Thu, 29 Jun 2023 20:00:42 +0800 Message-Id: <20230629120044.1261968-12-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230629120044.1261968-1-shikemeng@huaweicloud.com> References: <20230629120044.1261968-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quiwAZ1kw6DMMg--.26995S13 X-Coremail-Antispam: 1UD129KBjvJXoW7Ww4xuw1xWrWkCF4kAr4Dtwb_yoW8Cw4kpa n7AFy5Kry8Gr4q9ayxA3y0qrn5Cw18W3yDJrWfW348Cry7Gw1xGFn3tFyFyF1YgFW3Xr12 qr4Yvry7Ar48W37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB2b4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJw A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_Gr0_Xr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE 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, KHOP_HELO_FCRDNS,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1770010255875847006?= X-GMAIL-MSGID: =?utf-8?q?1770010255875847006?= In add_new_gdb_meta_bg, we assume that group could be non first group in meta block group as we call ext4_meta_bg_first_block_no to get first block of meta block group rather than call ext4_group_first_block_no for passed group directly. Then ext4_bg_has_super should be called with first group in meta group rather than new added group. Or we can call ext4_group_first_block_no instead of ext4_meta_bg_first_block_no to assume only first group of meta group will be passed. Either way, ext4_meta_bg_first_block_no will be useless and could be removed. This patch do it in first way to make add_new_gdb_meta_bg support non first group in meta block group. Signed-off-by: Kemeng Shi --- fs/ext4/resize.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index b9507e432496..da832466ce74 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -110,12 +110,6 @@ static ext4_group_t ext4_meta_bg_first_group(struct super_block *sb, EXT4_DESC_PER_BLOCK_BITS(sb); } -static ext4_fsblk_t ext4_meta_bg_first_block_no(struct super_block *sb, - ext4_group_t group) { - group = ext4_meta_bg_first_group(sb, group); - return ext4_group_first_block_no(sb, group); -} - static ext4_grpblk_t ext4_group_overhead_blocks(struct super_block *sb, ext4_group_t group) { ext4_grpblk_t overhead; @@ -954,8 +948,9 @@ static int add_new_gdb_meta_bg(struct super_block *sb, unsigned long gdb_num = group / EXT4_DESC_PER_BLOCK(sb); int err; - gdblock = ext4_meta_bg_first_block_no(sb, group) + - ext4_bg_has_super(sb, group); + group = ext4_meta_bg_first_group(sb, group); + gdblock = ext4_group_first_block_no(sb, group) + + ext4_bg_has_super(sb, group); gdb_bh = ext4_sb_bread(sb, gdblock, 0); if (IS_ERR(gdb_bh)) return PTR_ERR(gdb_bh); From patchwork Thu Jun 29 12:00:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 114152 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9389623vqr; Wed, 28 Jun 2023 21:31:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4WP9PvxQMDa0pKucm715lmfRaSHgr6otwTy5nfyTxAIjnQzSS/wd1UeOBU/nRZ19bXmuHQ X-Received: by 2002:a17:903:40c6:b0:1b8:3ddb:f9aa with SMTP id t6-20020a17090340c600b001b83ddbf9aamr3240547pld.14.1688013117709; Wed, 28 Jun 2023 21:31:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688013117; cv=none; d=google.com; s=arc-20160816; b=TZPZ2dOWXXhpvmPfZtHpkGykt4xu2QHe+HGSXT8r5Mil9wIw+Sp3r/IkD4fQ6+b79j YEbE4n1hs9emgNsKTctFoOkRO3kenXe/fqQ2p7wxuh72zH4s1KyV9VBpnZwhxl+D+fmi 7S7FUtCKvc4krGDM6UBS+aI+GRmHbGu/cgI6ROaa2uYKyo4b5MoifpgSqP32IAYrKkMo 76RDoreLwPVXxCibTBg4wMg4mBrgutU+9sWr/kdTkfpgufVARSjdrpPWgxx4MQyo5eQt J3X4cTV4p65VFCnz/XnJoqAEOK7ReNwC5IFPEFG+hhZe91RKz7Z5QKyniboxisIhEZsw SFYQ== 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=e9veEI1H38Bstlt5sUtgdoGTH0Um9U45TCpwtJ9GXyg=; fh=eu2llfKjKKC0QBUtW6YWJ13du6subP7SB8ZN6DjSWMA=; b=o+Ko6Bx3IWckZuZE/tj/3fsjUgXYIOdPodajODYU0+39pGHwo2Z0DOMA0BmJdfApzr zRmADHYvRBJbh2IyxY7l6zcWQRpw14koTpVpO5yO1dbN0HZnJLdXFC7720eeNoI1Bar1 ZjyLQFVjDcJujW9cTCHqE1p0aYJo8hvWhrJG71MhOQ+40kfezx85nIy/RHu4u/Ov9mo1 /T7m7Tb4cvC/mtkrLK06LUK+83fUSQIpZn2HarSLnJx6bPHr8aXq9C7tsDJ4RJ1pt9sN NaHRZ/YSSWzqnUhGrA9mmSa+JwrDjCDSBecPK3u0cvYuQ5h8exN5H1Dp81D5g2//u7Ga P8VA== 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 ji20-20020a170903325400b001b8216cfbe0si3828758plb.138.2023.06.28.21.31.43; Wed, 28 Jun 2023 21:31:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232397AbjF2EBe (ORCPT + 99 others); Thu, 29 Jun 2023 00:01:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231925AbjF2D7z (ORCPT ); Wed, 28 Jun 2023 23:59:55 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85C992D66; Wed, 28 Jun 2023 20:59:53 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Qs4Tf1L0Vz4f3lXF; Thu, 29 Jun 2023 11:59:50 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quiwAZ1kw6DMMg--.26995S14; Thu, 29 Jun 2023 11:59:50 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 12/13] ext4: remove unnecessary check for avoiding multiple update_backups in ext4_flex_group_add Date: Thu, 29 Jun 2023 20:00:43 +0800 Message-Id: <20230629120044.1261968-13-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230629120044.1261968-1-shikemeng@huaweicloud.com> References: <20230629120044.1261968-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quiwAZ1kw6DMMg--.26995S14 X-Coremail-Antispam: 1UD129KBjvJXoW7ZF1DJFy5trWkGF18AFyDGFg_yoW8Gr1fpw n0y3W8GrWjgr4v9a17Z34jg392kw48Ja4UZFyak3WYkrWUJas7WF97tF9YyF45tFZxAwn2 qF1YvrW7Aw1IgaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBIb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJw 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, KHOP_HELO_FCRDNS,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1770010042690528913?= X-GMAIL-MSGID: =?utf-8?q?1770010042690528913?= Commit 0acdb8876fead ("ext4: don't call update_backups() multiple times for the same bg") add check in ext4_flex_group_add to avoid call update_backups multiple times for block group descriptors in the same group descriptor block. However, we have already call update_backups in block step, so the added check is unnecessary. Signed-off-by: Kemeng Shi --- fs/ext4/resize.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index da832466ce74..d2b3ee50af31 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -1589,7 +1589,6 @@ static int ext4_flex_group_add(struct super_block *sb, int meta_bg = ext4_has_feature_meta_bg(sb); sector_t padding_blocks = meta_bg ? 0 : sbi->s_sbh->b_blocknr - ext4_group_first_block_no(sb, 0); - sector_t old_gdb = 0; update_backups(sb, ext4_group_first_block_no(sb, 0), (char *)es, sizeof(struct ext4_super_block), 0); @@ -1598,11 +1597,8 @@ static int ext4_flex_group_add(struct super_block *sb, gdb_bh = sbi_array_rcu_deref(sbi, s_group_desc, gdb_num); - if (old_gdb == gdb_bh->b_blocknr) - continue; update_backups(sb, gdb_bh->b_blocknr - padding_blocks, gdb_bh->b_data, gdb_bh->b_size, meta_bg); - old_gdb = gdb_bh->b_blocknr; } } exit: From patchwork Thu Jun 29 12:00:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 114150 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9384634vqr; Wed, 28 Jun 2023 21:17:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7yAt4WG6J0db+E5NTtjP3tvk6fKYzgx28olgFaQwk93Fqpf07wnigq0KK/q4P8v0vWTczQ X-Received: by 2002:a05:6a20:7f8e:b0:126:23d:cd10 with SMTP id d14-20020a056a207f8e00b00126023dcd10mr4560161pzj.21.1688012255649; Wed, 28 Jun 2023 21:17:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688012255; cv=none; d=google.com; s=arc-20160816; b=KCMExYCSOpT9jJ3Kf0pZzujVWIoAfJpag65FkbSDFlyjZmrK3eNXFhXdLr7FC+XA5l VMxw5jl9rbEp1y162piMlktho/yOdL2/ouYzOoDjAb3QCsa9bSAz+70/jIUrGLPLMHY5 usR+hw/7vrIXEzbFhmyOQIglSDh73Tb++fSFcR+Hm0U0AMxX0RBIJ+L1kEXXMfwc7+1B SmVEUntnp4VLPf2eAsi88DBpUWhYBBTr5rQtTSk6IE2/Md50DXOrFWxZ/WcHSa3013sI MGw802xrMbiOFhAUBTeda9oFIOxSJNUDm31otIVe9TuhWT6Mz6D/L7nXL5IEyqkclj7m l3Iw== 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=x9UKJ4ZirY7unvFoolTgEA0eSXG2kMMZdLzKIkfH5aE=; fh=eu2llfKjKKC0QBUtW6YWJ13du6subP7SB8ZN6DjSWMA=; b=Dcw7RthBAPGWaV6KRHOgxiJ1L1lMudHj/QVwRCeiku0cwb8GZK4proeT+HQlQyF8V4 BqmSdtv2jV2iMiTCXsDrZKemNOt9Dm0pMYCONSQVMZbz2HGutjb7H2TKEBC7AcZjW5ZT hHo2v3M5rf29Lk8hkuclPksk3qrw9VAg40C/h1gwNTsib9FRk6NX4DsvDa6u4mmsEuKb /eY/JHGeSiSDkXLGiY7oWtSoJjz5lg9zfEPPnc4Vi3aKyroEaqRXnVthIVCtLPHl1Afg AXsJvkb8Z4SQkItZfKmKsM4WGwbVfCL60erpaY8E5cbW4fHMob+0P8x3KdYAk52GmROs Eixg== 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 d4-20020a056a0010c400b0066896b4037csi10112614pfu.204.2023.06.28.21.17.21; Wed, 28 Jun 2023 21:17:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231453AbjF2EBt (ORCPT + 99 others); Thu, 29 Jun 2023 00:01:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231932AbjF2D7z (ORCPT ); Wed, 28 Jun 2023 23:59:55 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 319B72D69; Wed, 28 Jun 2023 20:59:53 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Qs4Tf3WPMz4f3x6K; Thu, 29 Jun 2023 11:59:50 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgC3quiwAZ1kw6DMMg--.26995S15; Thu, 29 Jun 2023 11:59:51 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 13/13] ext4: remove unnecessary initialization of count2 in set_flexbg_block_bitmap Date: Thu, 29 Jun 2023 20:00:44 +0800 Message-Id: <20230629120044.1261968-14-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230629120044.1261968-1-shikemeng@huaweicloud.com> References: <20230629120044.1261968-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgC3quiwAZ1kw6DMMg--.26995S15 X-Coremail-Antispam: 1UD129KBjvdXoWrZrWkXr4xZF43tw1kJF1kZrb_yoWfCrb_tF ZrAry8ZF4rZw1rKFyjqw45XFZ3tw4kJryUury5tr1ru3WqyayFya4Dury7Cr109r15Awn0 yFn3Jry3A34SgjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbSxYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM2 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, KHOP_HELO_FCRDNS,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1770009138946752083?= X-GMAIL-MSGID: =?utf-8?q?1770009138946752083?= We always overwrite count2 to "EXT4_CLUSTERS_PER_GROUP(sb) - (first_cluster - start)" after its initialization in for loop initialization statement . Just remove unnecessary initialization of count2. Signed-off-by: Kemeng Shi --- fs/ext4/resize.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index d2b3ee50af31..327475c2e2e7 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -453,8 +453,7 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle, ext4_debug("mark clusters [%llu-%llu] used\n", first_cluster, last_cluster); - for (count2 = count; count > 0; - count -= count2, first_cluster += count2) { + for (; count > 0; count -= count2, first_cluster += count2) { ext4_fsblk_t start; struct buffer_head *bh; ext4_group_t group;