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);