]> www.infradead.org Git - nvme.git/commitdiff
nilfs2: convert BUG_ON() in nilfs_finish_roll_forward() to WARN_ON()
authorRyusuke Konishi <konishi.ryusuke@gmail.com>
Wed, 8 May 2024 22:14:29 +0000 (07:14 +0900)
committerAndrew Morton <akpm@linux-foundation.org>
Sat, 11 May 2024 22:51:44 +0000 (15:51 -0700)
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().

Link: https://lkml.kernel.org/r/20240508221429.7559-1-konishi.ryusuke@gmail.com
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
fs/nilfs2/recovery.c

index e48372618ac400db126ea049c537b74aa47297c1..020f304c600e100441ea5bf2736b2741d9f19443 100644 (file)
@@ -699,7 +699,9 @@ static void nilfs_finish_roll_forward(struct the_nilfs *nilfs,
                return;
 
        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);