The patch titled
Subject: ocfs2:Use BUG_ON instead of if condition followed by BUG.
has been added to the -mm tree. Its filename is
ocfs2-use-bug_on-instead-of-if-condition-followed-by-bug.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/ocfs2-use-bug_on-instead-of-if-condition-followed-by-bug.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/ocfs2-use-bug_on-instead-of-if-condition-followed-by-bug.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Zhang Mingyu <zhang.mingyu@xxxxxxxxxx>
Subject: ocfs2:Use BUG_ON instead of if condition followed by BUG.
This issue was detected with the help of Coccinelle.
Link: https://lkml.kernel.org/r/20211105014424.75372-1-zhang.mingyu@xxxxxxxxxx
Signed-off-by: Zhang Mingyu <zhang.mingyu@xxxxxxxxxx>
Reported-by: Zeal Robot <zealci@xxxxxxxxxx>
Acked-by: Joseph Qi <joseph.qi@xxxxxxxxxxxxxxxxx>
Cc: Mark Fasheh <mark@xxxxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Cc: Junxiao Bi <junxiao.bi@xxxxxxxxxx>
Cc: Changwei Ge <gechangwei@xxxxxxx>
Cc: Gang He <ghe@xxxxxxxx>
Cc: Jun Piao <piaojun@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/journal.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- a/fs/ocfs2/journal.c~ocfs2-use-bug_on-instead-of-if-condition-followed-by-bug
+++ a/fs/ocfs2/journal.c
@@ -1669,8 +1669,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;
}
@@ -1699,8 +1698,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);
_
Patches currently in -mm which might be from zhang.mingyu@xxxxxxxxxx are
ocfs2-use-bug_on-instead-of-if-condition-followed-by-bug.patch
