nilfs2-switch-warn_ons-to-warning-output-in-nilfs_sufile_do_free.patch removed from -mm tree
The quilt patch titled
Subject: nilfs2: switch WARN_ONs to warning output in nilfs_sufile_do_free()
has been removed from the -mm tree. Its filename was
nilfs2-switch-warn_ons-to-warning-output-in-nilfs_sufile_do_free.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Ryusuke Konishi <[email protected]>
Subject: nilfs2: switch WARN_ONs to warning output in nilfs_sufile_do_free()
Date: Thu, 7 Dec 2023 13:57:30 +0900
nilfs_sufile_do_free(), which is called when log write fails or during GC, uses WARN_ONs to check for abnormal status of metadata. In the former case, these WARN_ONs will not be fired, but in the latter case they don't "never-happen". It is possible to trigger these by intentionally modifying the userland GC library to release segments that are not in the expected state.
So, replace them with warning output using the dedicated macro nilfs_warn().
This replaces two potentially triggered WARN_ONs with ones that use a warning output macro.
---
fs/nilfs2/sufile.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
fs/nilfs2/sufile.c renamed from fs/nilfs2/sufile.c~nilfs2-switch-warn_ons-to-warning-output-in-nilfs_sufile_do_free +7 -2
@@ -471,10 +471,15 @@ void nilfs_sufile_do_free(struct inode *kunmap_atomic (kaddr);return ; } -WARN_ON (nilfs_segment_usage_error (su)); -WARN_ON (!nilfs_segment_usage_dirty (su)); +if (unlikely (nilfs_segment_usage_error (su))) +nilfs_warn (sufile->i_sb,"free segment %llu marked in error" , + (unsigned long long )segnum); sudirty =nilfs_segment_usage_dirty (su); +if (unlikely (!sudirty)) +nilfs_warn (sufile->i_sb,"free unallocated segment %llu" , + (unsigned long long )segnum); +nilfs_segment_usage_set_clean (su);kunmap_atomic (kaddr);mark_buffer_dirty (su_bh);
_
Patches currently in -mm which might be from [email protected] are