2021-08-25 06:33:31

by CGEL

Subject: [PATCH linux-next] fs/ocfs2/dlm/dlmmaster.c: fix bugon.cocci warnings

From: Jing Yangyang <[email protected]>

Use BUG_ON instead of a if condition followed by BUG.

Generated by: scripts/coccinelle/misc/bugon.cocci

Reported-by: Zeal Robot <[email protected]>
Signed-off-by: Jing Yangyang <[email protected]>
---
fs/ocfs2/dlm/dlmmaster.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 227da5b..afaf9a7 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -2181,8 +2181,7 @@ static int dlm_pre_master_reco_lockres(struct dlm_ctxt *dlm,
ret = dlm_do_master_requery(dlm, res, nodenum, &master);
if (ret < 0) {
mlog_errno(ret);
- if (!dlm_is_host_down(ret))
- BUG();
+ BUG_ON(!dlm_is_host_down(ret));
/* host is down, so answer for that node would be
* DLM_LOCK_RES_OWNER_UNKNOWN. continue. */
ret = 0;
@@ -2238,8 +2237,7 @@ int dlm_drop_lockres_ref(struct dlm_ctxt *dlm, struct dlm_lock_resource *res)
mlog(ML_ERROR, "%s: res %.*s, DEREF to node %u got %d\n",
dlm->name, namelen, lockname, res->owner, r);
dlm_print_one_lock_resource(res);
- if (r == -ENOMEM)
- BUG();
+ BUG_ON(r == -ENOMEM);
} else
ret = r;

--
1.8.3.1

2021-08-25 08:29:13

by Joseph Qi

Subject: Re: [PATCH linux-next] fs/ocfs2/dlm/dlmmaster.c: fix bugon.cocci warnings

On 8/25/21 2:31 PM, CGEL wrote:
> From: Jing Yangyang <[email protected]>
>
> Use BUG_ON instead of a if condition followed by BUG.
>
> Generated by: scripts/coccinelle/misc/bugon.cocci
>
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: Jing Yangyang <[email protected]>

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

> ---
> fs/ocfs2/dlm/dlmmaster.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
> index 227da5b..afaf9a7 100644
> --- a/fs/ocfs2/dlm/dlmmaster.c
> +++ b/fs/ocfs2/dlm/dlmmaster.c
> @@ -2181,8 +2181,7 @@ static int dlm_pre_master_reco_lockres(struct dlm_ctxt *dlm,
> ret = dlm_do_master_requery(dlm, res, nodenum, &master);
> if (ret < 0) {
> mlog_errno(ret);
> - if (!dlm_is_host_down(ret))
> - BUG();
> + BUG_ON(!dlm_is_host_down(ret));
> /* host is down, so answer for that node would be
> * DLM_LOCK_RES_OWNER_UNKNOWN. continue. */
> ret = 0;
> @@ -2238,8 +2237,7 @@ int dlm_drop_lockres_ref(struct dlm_ctxt *dlm, struct dlm_lock_resource *res)
> mlog(ML_ERROR, "%s: res %.*s, DEREF to node %u got %d\n",
> dlm->name, namelen, lockname, res->owner, r);
> dlm_print_one_lock_resource(res);
> - if (r == -ENOMEM)
> - BUG();
> + BUG_ON(r == -ENOMEM);
> } else
> ret = r;
>
>