4:25 a.m.
From: kernel test robot <lkp(a)intel.com>
fs/ocfs2/journal.c:955:2-5: WARNING: Use BUG_ON
fs/ocfs2/journal.c:1613:3-6: WARNING: Use BUG_ON
fs/ocfs2/journal.c:1643:2-5: 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 | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -951,8 +951,7 @@ void ocfs2_journal_shutdown(struct ocfs2
goto done;
/* need to inc inode use count - jbd2_journal_destroy will iput. */
- if (!igrab(inode))
- BUG();
+ BUG_ON(!igrab(inode));
num_running_trans = atomic_read(&(osb->journal->j_num_trans));
trace_ocfs2_journal_shutdown(num_running_trans);
@@ -1609,8 +1608,7 @@ static int ocfs2_replay_journal(struct o
status = jbd2_journal_load(journal);
if (status < 0) {
mlog_errno(status);
- if (!igrab(inode))
- BUG();
+ BUG_ON(!igrab(inode));
jbd2_journal_destroy(journal);
goto done;
}
@@ -1639,8 +1637,7 @@ static int ocfs2_replay_journal(struct o
if (status < 0)
mlog_errno(status);
- if (!igrab(inode))
- BUG();
+ BUG_ON(!igrab(inode));
jbd2_journal_destroy(journal);