diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2022-04-14 21:31:27 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2022-04-14 21:31:27 -0400 |
| commit | 10b01ee92df52c8d7200afead4d5e5f55a5c58b1 (patch) | |
| tree | f18a3498212f54e20ffbbc62b5577c90ce53fb88 | |
| parent | 7102ffe4c166ca0f5e35137e9f9de83768c2d27d (diff) | |
| download | linux-stable-10b01ee92df52c8d7200afead4d5e5f55a5c58b1.tar.gz linux-stable-10b01ee92df52c8d7200afead4d5e5f55a5c58b1.tar.bz2 linux-stable-10b01ee92df52c8d7200afead4d5e5f55a5c58b1.zip | |
ext4: fix overhead calculation to account for the reserved gdt blocks
The kernel calculation was underestimating the overhead by not taking
into account the reserved gdt blocks. With this change, the overhead
calculated by the kernel matches the overhead calculation in mke2fs.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
| -rw-r--r-- | fs/ext4/super.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index f2a5e78f93a9..23a9b2c086ed 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4177,9 +4177,11 @@ static int count_overhead(struct super_block *sb, ext4_group_t grp, ext4_fsblk_t first_block, last_block, b; ext4_group_t i, ngroups = ext4_get_groups_count(sb); int s, j, count = 0; + int has_super = ext4_bg_has_super(sb, grp); if (!ext4_has_feature_bigalloc(sb)) - return (ext4_bg_has_super(sb, grp) + ext4_bg_num_gdb(sb, grp) + + return (has_super + ext4_bg_num_gdb(sb, grp) + + (has_super ? le16_to_cpu(sbi->s_es->s_reserved_gdt_blocks) : 0) + sbi->s_itb_per_group + 2); first_block = le32_to_cpu(sbi->s_es->s_first_data_block) + |