From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joseph Qi Date: Thu, 19 Mar 2015 19:17:00 +0800 Subject: [Ocfs2-devel] [PATCH 4/4 RESEND] ocfs2: remove goto statement in ocfs2_check_dir_for_entry() In-Reply-To: <20150227235329.GA12979@devel.8.8.4.4> References: <20150227235329.GA12979@devel.8.8.4.4> Message-ID: <550AB02C.20507@huawei.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Daeseok Youn Cc: mfasheh@suse.com, akpm@linux-foundation.org, ocfs2-devel@oss.oracle.com, linux-kernel@vger.kernel.org On 2015/2/28 7:53, Daeseok Youn wrote: > Signed-off-by: Daeseok Youn Reviewed-by: Joseph Qi > --- > 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; > } > > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753135AbbCSLRX (ORCPT ); Thu, 19 Mar 2015 07:17:23 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:51463 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751386AbbCSLRW (ORCPT ); Thu, 19 Mar 2015 07:17:22 -0400 Message-ID: <550AB02C.20507@huawei.com> Date: Thu, 19 Mar 2015 19:17:00 +0800 From: Joseph Qi User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: Daeseok Youn CC: , , , Subject: Re: [Ocfs2-devel] [PATCH 4/4 RESEND] ocfs2: remove goto statement in ocfs2_check_dir_for_entry() References: <20150227235329.GA12979@devel.8.8.4.4> In-Reply-To: <20150227235329.GA12979@devel.8.8.4.4> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.24.125] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020203.550AB037.00EC,ss=1,re=0.001,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 30ebed21dfa0e13e5b8efde17e17049d Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2015/2/28 7:53, Daeseok Youn wrote: > Signed-off-by: Daeseok Youn Reviewed-by: Joseph Qi > --- > 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; > } > >