ocfs2-devel.oss.oracle.com archive mirror
 help / color / mirror / Atom feed
* [Ocfs2-devel] [PATCH linux-next] fs/ocfs2/dlm/dlmmaster.c: fix bugon.cocci warnings
@ 2021-08-25  6:31 CGEL
  2021-08-25  8:27 ` Joseph Qi
  0 siblings, 1 reply; 2+ messages in thread
From: CGEL @ 2021-08-25  6:31 UTC (permalink / raw)
  To: Mark Fasheh
  Cc: Yury Norov, Jing Yangyang, Masahiro Yamada, linux-kernel,
	Zeal Robot, ocfs2-devel

From: Jing Yangyang <jing.yangyang@zte.com.cn>

Use BUG_ON instead of a if condition followed by BUG.

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

Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Jing Yangyang <jing.yangyang@zte.com.cn>
---
 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



_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [Ocfs2-devel] [PATCH linux-next] fs/ocfs2/dlm/dlmmaster.c: fix bugon.cocci warnings
  2021-08-25  6:31 [Ocfs2-devel] [PATCH linux-next] fs/ocfs2/dlm/dlmmaster.c: fix bugon.cocci warnings CGEL
@ 2021-08-25  8:27 ` Joseph Qi
  0 siblings, 0 replies; 2+ messages in thread
From: Joseph Qi @ 2021-08-25  8:27 UTC (permalink / raw)
  To: CGEL, Mark Fasheh, akpm
  Cc: Yury Norov, Jing Yangyang, Masahiro Yamada, linux-kernel,
	Zeal Robot, ocfs2-devel



On 8/25/21 2:31 PM, CGEL wrote:
> From: Jing Yangyang <jing.yangyang@zte.com.cn>
> 
> Use BUG_ON instead of a if condition followed by BUG.
> 
> Generated by: scripts/coccinelle/misc/bugon.cocci
> 
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Jing Yangyang <jing.yangyang@zte.com.cn>

Acked-by: Joseph Qi <joseph.qi@linux.alibaba.com>

> ---
>  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;
>  
> 

_______________________________________________
Ocfs2-devel mailing list
Ocfs2-devel@oss.oracle.com
https://oss.oracle.com/mailman/listinfo/ocfs2-devel

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-09-13 14:29 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-25  6:31 [Ocfs2-devel] [PATCH linux-next] fs/ocfs2/dlm/dlmmaster.c: fix bugon.cocci warnings CGEL
2021-08-25  8:27 ` 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).