diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2022-04-14 21:31:27 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-04-27 14:39:01 +0200 |
| commit | 52ca84a3edd1914e575450bcd1ce6cbc6e15e2cb (patch) | |
| tree | e26ae26e25cb4b3fa3a91ffaad7807935d260baa /fs | |
| parent | 6b952563934c37f29788122081acb9ff9f2ab17a (diff) | |
| download | linux-stable-52ca84a3edd1914e575450bcd1ce6cbc6e15e2cb.tar.gz linux-stable-52ca84a3edd1914e575450bcd1ce6cbc6e15e2cb.tar.bz2 linux-stable-52ca84a3edd1914e575450bcd1ce6cbc6e15e2cb.zip | |
ext4: fix overhead calculation to account for the reserved gdt blocks
commit 10b01ee92df52c8d7200afead4d5e5f55a5c58b1 upstream.
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
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -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 fd4d34deb9fc..0d2242d41ce2 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3697,9 +3697,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) + |