UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
youngjun 2020-04-26 07:33:16 -07:00 committed by Jan Kara
parent 00e0afb658
commit 7b26aa243d
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/notify/inotify/inotify_user.c
View File

@ -764,20 +764,18 @@ SYSCALL_DEFINE2(inotify_rm_watch, int, fd, __s32, wd)
struct fsnotify_group *group; struct fsnotify_group *group;
struct inotify_inode_mark *i_mark; struct inotify_inode_mark *i_mark;
struct fd f; struct fd f;
int ret = 0; int ret = -EINVAL;
f = fdget(fd); f = fdget(fd);
if (unlikely(!f.file)) if (unlikely(!f.file))
return -EBADF; return -EBADF;
/* verify that this is indeed an inotify instance */ /* verify that this is indeed an inotify instance */
ret = -EINVAL;
if (unlikely(f.file->f_op != &inotify_fops)) if (unlikely(f.file->f_op != &inotify_fops))
goto out; goto out;
group = f.file->private_data; group = f.file->private_data;
ret = -EINVAL;
i_mark = inotify_idr_find(group, wd); i_mark = inotify_idr_find(group, wd);
if (unlikely(!i_mark)) if (unlikely(!i_mark))
goto out; goto out;