From patchwork Tue Mar 21 16:12:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 72742 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1649379wrt; Tue, 21 Mar 2023 01:10:36 -0700 (PDT) X-Google-Smtp-Source: AK7set/6mdsjuFasZJWysaZihhkxLJiDeW56Zoo0rnUXnqN5mHcIIFLkUB0kCaavqQnUBFhpB0Gi X-Received: by 2002:a17:90b:1644:b0:23e:feef:38ef with SMTP id il4-20020a17090b164400b0023efeef38efmr1825369pjb.41.1679386236488; Tue, 21 Mar 2023 01:10:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679386236; cv=none; d=google.com; s=arc-20160816; b=kRH/Ei12dcTjkywaDbF90qK/91Ml+PXVDA0h9zREfUNHLbytwcHz8VpZpZBmaYzQmy spvvdHVFaKHvMNrQZ5SbcNdEhU8ocee8KTHjN2dZO2cA/lg01crgKgIPxIdJvfwPmpGD 7dgCLhlHWKnT/+z9zOHxh+XxZWjNLQU+SJ0ljP5XfxjZacZLwHf9uLukc2tqvobMpGnM /xmdw+mEVCY/5jKdAZU54Qpiqn/9JiCku8aEQiR4cKsqO9oEQ3zhgR7KlUu6QWUoB4MY JNMc4hAAzbESO8L3ulg6VCNBXEUP+RGl/9wFDXZyIv+8e7/oViSt/wQSGKBd/O7WNWju t/lw== 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=FU0z9T0T8IwfT5aTM3ROhj1WD4YCrO+lzYzL4cC9QgU=; b=05yGjlLCRqIvETPszWRMUzM5wLVbEd9tk5sImCNZAW3E4sTpFo6Mhb/36xHxkR2HTr 9piJhvD1Y/sMkusfYgRxmpDqY1V9pAQ8w3Y1XnhCsVfu6ngZ0rDxGvsnMaIGqbyUHuk5 htb8c8AooViImf0xbfh2LFAt6GMo5lLplGZcWvsbMTFdLVXgiSMQqBdlWYmJLGQuFH8D z9bG9gmxuhg5bz9PHthVvGD19M4ExysLrEiAValv8DV6CPaCc68g9L4G5qm3AXdv8Ftj pC+KLK8t2gASZJ8uSuM1VC83t1bOs6f15yjTJEMJfzHVMNuto5HLZfF/JJ/q/ACwCqCG DY4A== 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 o12-20020a1709026b0c00b001a1799a0db6si12541551plk.63.2023.03.21.01.10.21; Tue, 21 Mar 2023 01:10:36 -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 S230427AbjCUIJh (ORCPT + 99 others); Tue, 21 Mar 2023 04:09:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230180AbjCUIJb (ORCPT ); Tue, 21 Mar 2023 04:09:31 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE80A305D7; Tue, 21 Mar 2023 01:09:27 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Pgkll5T8lz4f3tpw; Tue, 21 Mar 2023 16:09:23 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbEzZhlk+NQhFw--.4478S4; Tue, 21 Mar 2023 16:09:25 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Cc: ojaswin@linux.ibm.com, shikemeng@huaweicloud.com Subject: [PATCH 2/8] ext4: fix unit mismatch in ext4_mb_new_blocks_simple Date: Wed, 22 Mar 2023 00:12:14 +0800 Message-Id: <20230321161220.418652-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230321161220.418652-1-shikemeng@huaweicloud.com> References: <20230321161220.418652-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbEzZhlk+NQhFw--.4478S4 X-Coremail-Antispam: 1UD129KBjvJXoW7tw1DGw1rWFyDKr18tFW5ZFb_yoW8GF13pw sIyF10kr1fWr1Dua17u3ySqw1fZ34xur47XrWfu34rWrWxXryxGFs3tF1rtF1rtFZxZ3ZI qr15Zryruw48G3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPSb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zV CS5cI20VAGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E 5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAV WUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY 1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI 0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7s RNVbyUUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760964102666556774?= X-GMAIL-MSGID: =?utf-8?q?1760964102666556774?= The "i" returned from mb_find_next_zero_bit is in cluster unit and we need offset "block" corresponding to "i" in block unit. Convert "i" to block unit to fix the unit mismatch. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 6318c763a239..7f695830621a 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -5761,6 +5761,7 @@ static ext4_fsblk_t ext4_mb_new_blocks_simple(handle_t *handle, { struct buffer_head *bitmap_bh; struct super_block *sb = ar->inode->i_sb; + struct ext4_sb_info *sbi = EXT4_SB(sb); ext4_group_t group; ext4_grpblk_t blkoff; ext4_grpblk_t max = EXT4_CLUSTERS_PER_GROUP(sb); @@ -5789,7 +5790,8 @@ static ext4_fsblk_t ext4_mb_new_blocks_simple(handle_t *handle, if (i >= max) break; if (ext4_fc_replay_check_excluded(sb, - ext4_group_first_block_no(sb, group) + i)) { + ext4_group_first_block_no(sb, group) + + EXT4_C2B(sbi, i))) { blkoff = i + 1; } else break; @@ -5806,7 +5808,7 @@ static ext4_fsblk_t ext4_mb_new_blocks_simple(handle_t *handle, return 0; } - block = ext4_group_first_block_no(sb, group) + i; + block = ext4_group_first_block_no(sb, group) + EXT4_C2B(sbi, i); ext4_mb_mark_bb(sb, block, 1, 1); ar->len = 1;