nilfs2-convert-bug_on-in-nilfs_finish_roll_forward-to-warn_on.patch removed from -mm tree
The quilt patch titled
Subject: nilfs2: convert BUG_ON() in nilfs_finish_roll_forward() to WARN_ON()
has been removed from the -mm tree. Its filename was
nilfs2-convert-bug_on-in-nilfs_finish_roll_forward-to-warn_on.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: convert BUG_ON() in nilfs_finish_roll_forward() to WARN_ON()
Date: Thu, 9 May 2024 07:14:29 +0900
The BUG_ON check performed on the return value of __getblk() in nilfs_finish_roll_forward() assumes that a buffer that has been successfully read once is retrieved with the same parameters and does not fail (__getblk() does not return an error due to memory allocation failure). Also, nilfs_finish_roll_forward() is called at most once during mount.
Taking these into consideration, rewrite the check to use WARN_ON() to avoid using BUG_ON().
---
fs/nilfs2/recovery.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/nilfs2/recovery.c renamed from fs/nilfs2/recovery.c~nilfs2-convert-bug_on-in-nilfs_finish_roll_forward-to-warn_on +3 -1
@@ -699,7 +699,9 @@ static void nilfs_finish_roll_forward(streturn ; bh =__getblk (nilfs->ns_bdev, ri->ri_lsegs_start, nilfs->ns_blocksize); -BUG_ON (!bh); +if (WARN_ON (!bh)) +return ;/* should never happen */ +memset (bh->b_data,0 , bh->b_size);set_buffer_dirty (bh); err =sync_dirty_buffer (bh);
_
Patches currently in -mm which might be from [email protected] are