inotify: Fix error return code assignment flow.
Subsystems (3)
PATCH 1/1 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(-)
fs/notify/inotify/inotify_user.c +1 -3
@@ -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;
Signature · 1 line
2.17.1
Jan Kara
maintainerQuoted 3 lines · youngjun
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
Quoted 33 lines
--- fs/notify/inotify/inotify_user.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)fs/notify/inotify/inotify_user.c +1
-3@@ -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;Signature · 1 line
2.17.1
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR