Re: [PATCH] ocfs2:Use BUG_ON instead of if condition followed by BUG.

From: Joseph Qi
Date: Thu Nov 04 2021 - 21:55:00 EST




On 11/5/21 9:44 AM, cgel.zte@xxxxxxxxx wrote:
> From: Zhang Mingyu <zhang.mingyu@xxxxxxxxxx>
>
> This issue was detected with the help of Coccinelle.
>
> Reported-by: Zeal Robot <zealci@xxxxxxxxxx>
> Signed-off-by: Zhang Mingyu <zhang.mingyu@xxxxxxxxxx>

Acked-by: Joseph Qi <joseph.qi@xxxxxxxxxxxxxxxxx>
> ---
> fs/ocfs2/journal.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
> index dbf9b9e97d74..1887a2708709 100644
> --- a/fs/ocfs2/journal.c
> +++ b/fs/ocfs2/journal.c
> @@ -1669,8 +1669,7 @@ static int ocfs2_replay_journal(struct ocfs2_super *osb,
> 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 ocfs2_super *osb,
> if (status < 0)
> mlog_errno(status);
>
> - if (!igrab(inode))
> - BUG();
> + BUG_ON(!igrab(inode));
>
> jbd2_journal_destroy(journal);
>
>