4:25 a.m.
From: kernel test robot <lkp(a)intel.com>
fs/reiserfs/journal.c:1112:3-6: WARNING: Use BUG_ON
fs/reiserfs/journal.c:1397:2-5: WARNING: Use BUG_ON
fs/reiserfs/journal.c:742:3-6: WARNING: Use BUG_ON
fs/reiserfs/journal.c:654:2-5: WARNING: Use BUG_ON
fs/reiserfs/journal.c:656:2-5: WARNING: Use BUG_ON
fs/reiserfs/journal.c:666:2-5: WARNING: Use BUG_ON
fs/reiserfs/journal.c:1666:5-8: WARNING: Use BUG_ON
Use BUG_ON instead of a if condition followed by BUG.
Semantic patch information:
This makes an effort to find cases where BUG() follows an if
condition on an expression and replaces the if condition and BUG()
with a BUG_ON having the conditional expression of the if statement
as argument.
Generated by: scripts/coccinelle/misc/bugon.cocci
Fixes: 8214bf079208 ("scripts/dtc: Export YYLOC global declaration")
Reported-by: kernel test robot <lkp(a)intel.com>
Signed-off-by: kernel test robot <lkp(a)intel.com>
---
tree: https://android.googlesource.com/kernel/goldfish android-3.18
head: dd54b61f1458c03f68fc019b4874d98f2f0ae3a5
commit: 8214bf079208b146e63cd0a3ce0ed335a87ce7b3 [396/1051] scripts/dtc: Export YYLOC
global declaration
:::::: branch date: 5 weeks ago
:::::: commit date: 3 months ago
Please take the patch only if it's a positive warning. Thanks!
journal.c | 23 +++++++----------------
1 file changed, 7 insertions(+), 16 deletions(-)
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -650,10 +650,8 @@ static void submit_logged_buffer(struct
bh->b_end_io = reiserfs_end_buffer_io_sync;
clear_buffer_journal_new(bh);
clear_buffer_dirty(bh);
- if (!test_clear_buffer_journal_test(bh))
- BUG();
- if (!buffer_uptodate(bh))
- BUG();
+ BUG_ON(!test_clear_buffer_journal_test(bh));
+ BUG_ON(!buffer_uptodate(bh));
submit_bh(WRITE, bh);
}
@@ -662,8 +660,7 @@ static void submit_ordered_buffer(struct
get_bh(bh);
bh->b_end_io = reiserfs_end_ordered_io;
clear_buffer_dirty(bh);
- if (!buffer_uptodate(bh))
- BUG();
+ BUG_ON(!buffer_uptodate(bh));
submit_bh(WRITE, bh);
}
@@ -738,8 +735,7 @@ void reiserfs_free_jh(struct buffer_head
jh->bh = NULL;
list_del_init(&jh->list);
kfree(jh);
- if (atomic_read(&nr_reiserfs_jh) <= 0)
- BUG();
+ BUG_ON(atomic_read(&nr_reiserfs_jh) <= 0);
atomic_dec(&nr_reiserfs_jh);
put_bh(bh);
}
@@ -1108,8 +1104,7 @@ static int flush_commit_list(struct supe
* the file system.
*/
if (likely(!retval && !reiserfs_is_journal_aborted (journal))) {
- if (buffer_dirty(jl->j_commit_bh))
- BUG();
+ BUG_ON(buffer_dirty(jl->j_commit_bh));
mark_buffer_dirty(jl->j_commit_bh) ;
depth = reiserfs_write_unlock_nested(s);
if (reiserfs_barrier_flush(s))
@@ -1392,9 +1387,7 @@ static int flush_journal_list(struct sup
*/
flush_commit_list(s, jl, 1);
- if (!(jl->j_state & LIST_DIRTY)
- && !reiserfs_is_journal_aborted(journal))
- BUG();
+ BUG_ON(!(jl->j_state & LIST_DIRTY) &&
!reiserfs_is_journal_aborted(journal));
/* are we done now? */
if (atomic_read(&jl->j_nonzerolen) <= 0 &&
@@ -1661,9 +1654,7 @@ static int write_one_transaction(struct
get_bh(tmp_bh);
lock_buffer(tmp_bh);
if (cn->bh && can_dirty(cn) && buffer_dirty(tmp_bh)) {
- if (!buffer_journal_dirty(tmp_bh) ||
- buffer_journal_prepared(tmp_bh))
- BUG();
+ BUG_ON(!buffer_journal_dirty(tmp_bh) || buffer_journal_prepared(tmp_bh));
add_to_chunk(chunk, tmp_bh, NULL, write_chunk);
ret++;
} else {