Commit 7b26aa24 authored by youngjun's avatar youngjun Committed by Jan Kara
Browse files

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: default avataryoungjun <her0gyugyu@gmail.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 00e0afb6

fs/notify/inotify/inotify_user.c

+1 −3
Original line number Diff line number Diff line
@@ -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;