Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 27 Apr 2020 12:15:22 +0200
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.
Message-ID: <20200427101522.GD15107@quack2.suse.cz>
References: <20200426143316.29877-1-her0gyugyu@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20200426143316.29877-1-her0gyugyu@gmail.com>
User-Agent: Mutt/1.10.1 (2018-07-13)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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