2020-04-26 14:36:16

by YoungJun.park

Subject: [PATCH] inotify: Fix error return code assignment flow.

If error code is initialized -EINVAL, there is no need to assign -EINVAL.

Signed-off-by: youngjun <[email protected]>
---
fs/notify/inotify/inotify_user.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 81ffc8629fc4..f88bbcc9efeb 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -764,20 +764,18 @@ SYSCALL_DEFINE2(inotify_rm_watch, int, fd, __s32, wd)
struct fsnotify_group *group;
struct inotify_inode_mark *i_mark;
struct fd f;
- int ret = 0;
+ int ret = -EINVAL;

f = fdget(fd);
if (unlikely(!f.file))
return -EBADF;

/* verify that this is indeed an inotify instance */
- ret = -EINVAL;
if (unlikely(f.file->f_op != &inotify_fops))
goto out;

group = f.file->private_data;

- ret = -EINVAL;
i_mark = inotify_idr_find(group, wd);
if (unlikely(!i_mark))
goto out;
--
2.17.1

2020-04-27 10:19:11

by Jan Kara

Subject: Re: [PATCH] inotify: Fix error return code assignment flow.

On Sun 26-04-20 07:33:16, youngjun wrote:
> If error code is initialized -EINVAL, there is no need to assign -EINVAL.
>
> Signed-off-by: youngjun <[email protected]>

Thanks. I've added the cleanup to my tree,

Honza

> ---
> fs/notify/inotify/inotify_user.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
> index 81ffc8629fc4..f88bbcc9efeb 100644
> --- a/fs/notify/inotify/inotify_user.c
> +++ b/fs/notify/inotify/inotify_user.c
> @@ -764,20 +764,18 @@ SYSCALL_DEFINE2(inotify_rm_watch, int, fd, __s32, wd)
> struct fsnotify_group *group;
> struct inotify_inode_mark *i_mark;
> struct fd f;
> - int ret = 0;
> + int ret = -EINVAL;
>
> f = fdget(fd);
> if (unlikely(!f.file))
> return -EBADF;
>
> /* verify that this is indeed an inotify instance */
> - ret = -EINVAL;
> if (unlikely(f.file->f_op != &inotify_fops))
> goto out;
>
> group = f.file->private_data;
>
> - ret = -EINVAL;
> i_mark = inotify_idr_find(group, wd);
> if (unlikely(!i_mark))
> goto out;
> --
> 2.17.1
>
--
Jan Kara <[email protected]>
SUSE Labs, CR