2021-08-28 01:09:27

by CGEL

Subject: [PATCH linux-next] ocfs2: fix bugon.cocci warnings

From: Changcheng Deng <[email protected]>

Use BUG_ON instead of if condition followed by BUG.

Reported-by: Zeal Robot <[email protected]>
Signed-off-by: Changcheng Deng <[email protected]>
---
fs/ocfs2/journal.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index 4f15750..2305aa5 100644
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -974,8 +974,7 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb)
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);
@@ -1656,8 +1655,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;
}
@@ -1686,8 +1684,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);

--
1.8.3.1

2021-08-29 13:25:17

by Joseph Qi

Subject: Re: [PATCH linux-next] ocfs2: fix bugon.cocci warnings

On 8/28/21 9:04 AM, CGEL wrote:
> From: Changcheng Deng <[email protected]>
>
> Use BUG_ON instead of if condition followed by BUG.
>
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: Changcheng Deng <[email protected]>

Acked-by: Joseph Qi <[email protected]>

BTW, could you send out a series to clean all in ocfs2?

> ---
> fs/ocfs2/journal.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
> index 4f15750..2305aa5 100644
> --- a/fs/ocfs2/journal.c
> +++ b/fs/ocfs2/journal.c
> @@ -974,8 +974,7 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb)
> 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);
> @@ -1656,8 +1655,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;
> }
> @@ -1686,8 +1684,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);
>
>