On 2024/5/12 23:10, Jan Kara wrote: > On Wed 08-05-24 14:12:13, Zhang Yi wrote: >> From: Zhang Yi <yi.zhang@xxxxxxxxxx> >> >> The per-inode i_reserved_data_blocks count the reserved delalloc blocks >> in a regular file, it should be zero when destroying the file. The >> per-fs s_dirtyclusters_counter count all reserved delalloc blocks in a >> filesystem, it also should be zero when umounting the filesystem. Now we >> have only an error message if the i_reserved_data_blocks is not zero, >> which is unable to be simply captured, so add WARN_ON_ONCE to make it >> more visable. >> >> Signed-off-by: Zhang Yi <yi.zhang@xxxxxxxxxx> > > Well, maybe the warnings could be guarded by !(EXT4_SB(sb)->s_mount_state & > EXT4_ERROR_FS)? Because the warning isn't very interesting when the > filesystem was corrupted and if somebody runs with errors=continue we would > still possibly hit this warning although we don't really care... > Make sense, I missed the errors=continue mode. Thanks, Yi. > >> --- >> fs/ext4/super.c | 6 +++++- >> 1 file changed, 5 insertions(+), 1 deletion(-) >> >> diff --git a/fs/ext4/super.c b/fs/ext4/super.c >> index 044135796f2b..440dd54eea25 100644 >> --- a/fs/ext4/super.c >> +++ b/fs/ext4/super.c >> @@ -1343,6 +1343,9 @@ static void ext4_put_super(struct super_block *sb) >> >> ext4_group_desc_free(sbi); >> ext4_flex_groups_free(sbi); >> + >> + WARN_ON_ONCE(!ext4_forced_shutdown(sb) && >> + percpu_counter_sum(&sbi->s_dirtyclusters_counter)); >> ext4_percpu_param_destroy(sbi); >> #ifdef CONFIG_QUOTA >> for (int i = 0; i < EXT4_MAXQUOTAS; i++) >> @@ -1473,7 +1476,8 @@ static void ext4_destroy_inode(struct inode *inode) >> dump_stack(); >> } >> >> - if (EXT4_I(inode)->i_reserved_data_blocks) >> + if (!ext4_forced_shutdown(inode->i_sb) && >> + WARN_ON_ONCE(EXT4_I(inode)->i_reserved_data_blocks)) >> ext4_msg(inode->i_sb, KERN_ERR, >> "Inode %lu (%p): i_reserved_data_blocks (%u) not cleared!", >> inode->i_ino, EXT4_I(inode), >> -- >> 2.39.2 >>
