* [PATCH linux-next] ocfs2: fix bugon.cocci warnings
@ 2021-08-28 1:04 CGEL
2021-08-29 13:23 ` Joseph Qi
0 siblings, 1 reply; 2+ messages in thread
From: CGEL @ 2021-08-28 1:04 UTC (permalink / raw)
To: Mark Fasheh
Cc: Joel Becker, Joseph Qi, ocfs2-devel, linux-kernel,
Changcheng Deng, Zeal Robot
From: Changcheng Deng <deng.changcheng@zte.com.cn>
Use BUG_ON instead of if condition followed by BUG.
Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Changcheng Deng <deng.changcheng@zte.com.cn>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH linux-next] ocfs2: fix bugon.cocci warnings
2021-08-28 1:04 [PATCH linux-next] ocfs2: fix bugon.cocci warnings CGEL
@ 2021-08-29 13:23 ` Joseph Qi
0 siblings, 0 replies; 2+ messages in thread
From: Joseph Qi @ 2021-08-29 13:23 UTC (permalink / raw)
To: CGEL, Mark Fasheh, akpm
Cc: Joel Becker, ocfs2-devel, linux-kernel, Changcheng Deng, Zeal Robot
On 8/28/21 9:04 AM, CGEL wrote:
> From: Changcheng Deng <deng.changcheng@zte.com.cn>
>
> Use BUG_ON instead of if condition followed by BUG.
>
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Changcheng Deng <deng.changcheng@zte.com.cn>
Acked-by: Joseph Qi <joseph.qi@linux.alibaba.com>
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);
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-08-29 13:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-28 1:04 [PATCH linux-next] ocfs2: fix bugon.cocci warnings CGEL
2021-08-29 13:23 ` Joseph Qi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).