2021-01-28 08:28:31

by Abaci Team

Subject: [PATCH] kernfs: Remove redundant code

Fix the following coccicheck warnings:

./fs/kernfs/file.c:647:1-3: WARNING: possible condition with no effect
(if == else).

Reported-by: Abaci Robot <[email protected]>
Suggested-by: Jiapeng Zhong <[email protected]>
Signed-off-by: Abaci Team <[email protected]>
---
fs/kernfs/file.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
index c757193..9a74c9d 100644
--- a/fs/kernfs/file.c
+++ b/fs/kernfs/file.c
@@ -644,11 +644,7 @@ static int kernfs_fop_open(struct inode *inode, struct file *file)
* Both paths of the branch look the same. They're supposed to
* look that way and give @of->mutex different static lockdep keys.
*/
- if (has_mmap)
- mutex_init(&of->mutex);
- else
- mutex_init(&of->mutex);
-
+ mutex_init(&of->mutex);
of->kn = kn;
of->file = file;

--
1.8.3.1

2021-01-28 16:41:51

by Tejun Heo

Subject: Re: [PATCH] kernfs: Remove redundant code

On Thu, Jan 28, 2021 at 04:25:32PM +0800, Abaci Team wrote:
> Fix the following coccicheck warnings:
>
> ./fs/kernfs/file.c:647:1-3: WARNING: possible condition with no effect
> (if == else).
>
> Reported-by: Abaci Robot <[email protected]>
> Suggested-by: Jiapeng Zhong <[email protected]>
> Signed-off-by: Abaci Team <[email protected]>
> ---
> fs/kernfs/file.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
> index c757193..9a74c9d 100644
> --- a/fs/kernfs/file.c
> +++ b/fs/kernfs/file.c
> @@ -644,11 +644,7 @@ static int kernfs_fop_open(struct inode *inode, struct file *file)
> * Both paths of the branch look the same. They're supposed to
> * look that way and give @of->mutex different static lockdep keys.

Please read the comment right above.

Thanks.

--
tejun