diff options
| author |   Theodore Ts'o <tytso@mit.edu> | 2022-04-14 21:57:49 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2022-04-14 22:05:47 -0400 |
| commit | 85d825dbf4899a69407338bae462a59aa9a37326 (patch) | |
| tree | 2b4ee6db488034058c47eb3a1653a8b8b642181f /fs/ext4/super.c | |
| parent | ext4: fix overhead calculation to account for the reserved gdt blocks (diff) | |
| download | linux-dev-85d825dbf4899a69407338bae462a59aa9a37326.tar.xz linux-dev-85d825dbf4899a69407338bae462a59aa9a37326.zip | |
ext4: force overhead calculation if the s_overhead_cluster makes no sense
If the file system does not use bigalloc, calculating the overhead is
cheap, so force the recalculation of the overhead so we don't have to
trust the precalculated overhead in the superblock.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
Diffstat (limited to 'fs/ext4/super.c')
| -rw-r--r-- | fs/ext4/super.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 23a9b2c086ed..d08820fdfdee 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -5289,9 +5289,18 @@ no_journal: * Get the # of file system overhead blocks from the * superblock if present. */ - if (es->s_overhead_clusters) - sbi->s_overhead = le32_to_cpu(es->s_overhead_clusters); - else { + sbi->s_overhead = le32_to_cpu(es->s_overhead_clusters); + /* ignore the precalculated value if it is ridiculous */ + if (sbi->s_overhead > ext4_blocks_count(es)) + sbi->s_overhead = 0; + /* + * If the bigalloc feature is not enabled recalculating the + * overhead doesn't take long, so we might as well just redo + * it to make sure we are using the correct value. + */ + if (!ext4_has_feature_bigalloc(sb)) + sbi->s_overhead = 0; + if (sbi->s_overhead == 0) { err = ext4_calculate_overhead(sb); if (err) goto failed_mount_wq; |