ext4: simplify calculation of blkoff in ext4_mb_new_blocks_simple

[ Upstream commit 253cacb0de89235673ad5889d61f275a73dbee79 ]

We try to allocate a block from goal in ext4_mb_new_blocks_simple. We
only need get blkoff in first group with goal and set blkoff to 0 for
the rest groups.

Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
Link: https://lore.kernel.org/r/20230303172120.3800725-21-shikemeng@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Stable-dep-of: 3f4830abd236 ("ext4: fix potential unnitialized variable")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index c1d632725c2c0a9cb5daa1acc577ed38323fbf4e..26beaf102ce36ac364b93458e4c0541fd3e94ab3 100644 (file)
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -5371,9 +5371,6 @@ static ext4_fsblk_t ext4_mb_new_blocks_simple(handle_t *handle,
                        return 0;
                }
 
-               ext4_get_group_no_and_offset(sb,
-                       max(ext4_group_first_block_no(sb, group), goal),
-                       NULL, &blkoff);
                while (1) {
                        i = mb_find_next_zero_bit(bitmap_bh->b_data, max,
                                                blkoff);
@@ -5388,6 +5385,8 @@ static ext4_fsblk_t ext4_mb_new_blocks_simple(handle_t *handle,
                brelse(bitmap_bh);
                if (i < max)
                        break;
+
+               blkoff = 0;
        }
 
        if (group >= ext4_get_groups_count(sb) || i >= max) {