2021-11-12 09:25:57

by CGEL

Subject: [PATCH] 9p: Use BUG_ON instead of if condition followed by BUG.

From: Zhang Mingyu <[email protected]>

This issue was detected with the help of Coccinelle.

Reported-by: Zeal Robot <[email protected]>
Signed-off-by: Zhang Mingyu <[email protected]>
---
fs/9p/vfs_file.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index 4244d48398ef..f2375448cafc 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -139,8 +139,7 @@ static int v9fs_file_do_lock(struct file *filp, int cmd, struct file_lock *fl)
fid = filp->private_data;
BUG_ON(fid == NULL);

- if ((fl->fl_flags & FL_POSIX) != FL_POSIX)
- BUG();
+ BUG_ON((fl->fl_flags & FL_POSIX) != FL_POSIX);

res = locks_lock_file_wait(filp, fl);
if (res < 0)
--
2.25.1

2021-12-18 11:17:11

by Dominique Martinet

Subject: Re: [PATCH] 9p: Use BUG_ON instead of if condition followed by BUG.

[email protected] wrote on Fri, Nov 12, 2021 at 09:25:47AM +0000:
> From: Zhang Mingyu <[email protected]>
>
> This issue was detected with the help of Coccinelle.
>
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: Zhang Mingyu <[email protected]>

I realize I've never replied to this mail when applying old patches now,
I've picked this up too.

> ---
> fs/9p/vfs_file.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
> index 4244d48398ef..f2375448cafc 100644
> --- a/fs/9p/vfs_file.c
> +++ b/fs/9p/vfs_file.c
> @@ -139,8 +139,7 @@ static int v9fs_file_do_lock(struct file *filp, int cmd, struct file_lock *fl)
> fid = filp->private_data;
> BUG_ON(fid == NULL);
>
> - if ((fl->fl_flags & FL_POSIX) != FL_POSIX)
> - BUG();
> + BUG_ON((fl->fl_flags & FL_POSIX) != FL_POSIX);
>
> res = locks_lock_file_wait(filp, fl);
> if (res < 0)

--
Dominique