From: Jan Kara <jack@suse.cz>
To: youngjun <her0gyugyu@gmail.com>
Cc: Jan Kara <jack@suse.cz>, Amir Goldstein <amir73il@gmail.com>,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] inotify: Fix error return code assignment flow.
Date: Mon, 27 Apr 2020 12:15:22 +0200 [thread overview]
Message-ID: <20200427101522.GD15107@quack2.suse.cz> (raw)
In-Reply-To: <20200426143316.29877-1-her0gyugyu@gmail.com>
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 <her0gyugyu@gmail.com>
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 <jack@suse.com>
SUSE Labs, CR
prev parent reply other threads:[~2020-04-27 10:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-26 14:33 [PATCH] inotify: Fix error return code assignment flow youngjun
2020-04-27 10:15 ` Jan Kara [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200427101522.GD15107@quack2.suse.cz \
--to=jack@suse.cz \
--cc=amir73il@gmail.com \
--cc=her0gyugyu@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).