[Ocfs2-devel] [PATCH 4/4 RESEND] ocfs2: remove goto statement in ocfs2_check_dir_for_entry()

[Joseph Qi]

On 2015/2/28 7:53, Daeseok Youn wrote:
> Signed-off-by: Daeseok Youn <daeseok.youn at gmail.com>

Reviewed-by: Joseph Qi <joseph.qi at huawei.com>
> ---
> RESEND: this patch is rebased by 1/4.
> 
>  fs/ocfs2/dir.c |   13 +++++--------
>  1 files changed, 5 insertions(+), 8 deletions(-)
> 
> diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
> index c63f2b6..b3ab2a6 100644
> --- a/fs/ocfs2/dir.c
> +++ b/fs/ocfs2/dir.c
> @@ -2043,22 +2043,19 @@ int ocfs2_check_dir_for_entry(struct inode *dir,
>  			      const char *name,
>  			      int namelen)
>  {
> -	int ret;
> +	int ret = 0;
>  	struct ocfs2_dir_lookup_result lookup = { NULL, };
>  
>  	trace_ocfs2_check_dir_for_entry(
>  		(unsigned long long)OCFS2_I(dir)->ip_blkno, namelen, name);
>  
> -	ret = -EEXIST;
> -	if (ocfs2_find_entry(name, namelen, dir, &lookup) == 0)
> -		goto bail;
> +	if (ocfs2_find_entry(name, namelen, dir, &lookup) == 0) {
> +		ret = -EEXIST;
> +		mlog_errno(ret);
> +	}
>  
> -	ret = 0;
> -bail:
>  	ocfs2_free_dir_lookup_result(&lookup);
>  
> -	if (ret)
> -		mlog_errno(ret);
>  	return ret;
>  }
>  
>