summaryrefslogtreecommitdiffstats
path: root/fs/notify
diff options
context:
space:
mode:
authoryoungjun <her0gyugyu@gmail.com>2020-04-26 16:33:16 +0200
committerJan Kara <jack@suse.cz>2020-04-27 12:14:56 +0200
commit7b26aa243d3c4d9a564e87c17dc4317a67727335 (patch)
tree114985f0aff8badf9125c602a364f8bde76cd867 /fs/notify
parentfsnotify: Add missing annotation for fsnotify_finish_user_wait() and for fsno... (diff)
downloadlinux-7b26aa243d3c4d9a564e87c17dc4317a67727335.tar.xz
linux-7b26aa243d3c4d9a564e87c17dc4317a67727335.zip
inotify: Fix error return code assignment flow.
If error code is initialized -EINVAL, there is no need to assign -EINVAL. Link: https://lore.kernel.org/r/20200426143316.29877-1-her0gyugyu@gmail.com Signed-off-by: youngjun <her0gyugyu@gmail.com> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/notify')
-rw-r--r--fs/notify/inotify/inotify_user.c4
1 files changed, 1 insertions, 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;