From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754142AbaKRLFu (ORCPT ); Tue, 18 Nov 2014 06:05:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52854 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754041AbaKRLFs (ORCPT ); Tue, 18 Nov 2014 06:05:48 -0500 Message-ID: <546B27FF.6080702@redhat.com> Date: Tue, 18 Nov 2014 11:05:35 +0000 From: Steven Whitehouse User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.1.1 MIME-Version: 1.0 To: SF Markus Elfring , cluster-devel@redhat.com CC: LKML , kernel-janitors@vger.kernel.org, Coccinelle Subject: Re: [PATCH 1/1] GFS2: Deletion of unnecessary checks before two function calls References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <546B20F0.9040202@users.sourceforge.net> In-Reply-To: <546B20F0.9040202@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, Now in the GFS2 -nmw git tree. Thanks, Steve. On 18/11/14 10:35, SF Markus Elfring wrote: > From: Markus Elfring > Date: Tue, 18 Nov 2014 11:31:23 +0100 > > The functions iput() and put_pid() test whether their argument is NULL > and then return immediately. Thus the test around the call is not needed. > > This issue was detected by using the Coccinelle software. > > Signed-off-by: Markus Elfring > --- > fs/gfs2/glock.c | 3 +-- > fs/gfs2/ops_fstype.c | 3 +-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c > index 7f513b1..f4aa085 100644 > --- a/fs/gfs2/glock.c > +++ b/fs/gfs2/glock.c > @@ -836,8 +836,7 @@ void gfs2_holder_reinit(unsigned int state, unsigned flags, struct gfs2_holder * > gh->gh_flags = flags; > gh->gh_iflags = 0; > gh->gh_ip = (unsigned long)__builtin_return_address(0); > - if (gh->gh_owner_pid) > - put_pid(gh->gh_owner_pid); > + put_pid(gh->gh_owner_pid); > gh->gh_owner_pid = get_pid(task_pid(current)); > } > > diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c > index d3eae24..272ff81 100644 > --- a/fs/gfs2/ops_fstype.c > +++ b/fs/gfs2/ops_fstype.c > @@ -918,8 +918,7 @@ fail_qc_i: > fail_ut_i: > iput(sdp->sd_sc_inode); > fail: > - if (pn) > - iput(pn); > + iput(pn); > return error; > } > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Whitehouse Date: Tue, 18 Nov 2014 11:05:35 +0000 Subject: [Cluster-devel] [PATCH 1/1] GFS2: Deletion of unnecessary checks before two function calls In-Reply-To: <546B20F0.9040202@users.sourceforge.net> References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <546B20F0.9040202@users.sourceforge.net> Message-ID: <546B27FF.6080702@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Hi, Now in the GFS2 -nmw git tree. Thanks, Steve. On 18/11/14 10:35, SF Markus Elfring wrote: > From: Markus Elfring > Date: Tue, 18 Nov 2014 11:31:23 +0100 > > The functions iput() and put_pid() test whether their argument is NULL > and then return immediately. Thus the test around the call is not needed. > > This issue was detected by using the Coccinelle software. > > Signed-off-by: Markus Elfring > --- > fs/gfs2/glock.c | 3 +-- > fs/gfs2/ops_fstype.c | 3 +-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c > index 7f513b1..f4aa085 100644 > --- a/fs/gfs2/glock.c > +++ b/fs/gfs2/glock.c > @@ -836,8 +836,7 @@ void gfs2_holder_reinit(unsigned int state, unsigned flags, struct gfs2_holder * > gh->gh_flags = flags; > gh->gh_iflags = 0; > gh->gh_ip = (unsigned long)__builtin_return_address(0); > - if (gh->gh_owner_pid) > - put_pid(gh->gh_owner_pid); > + put_pid(gh->gh_owner_pid); > gh->gh_owner_pid = get_pid(task_pid(current)); > } > > diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c > index d3eae24..272ff81 100644 > --- a/fs/gfs2/ops_fstype.c > +++ b/fs/gfs2/ops_fstype.c > @@ -918,8 +918,7 @@ fail_qc_i: > fail_ut_i: > iput(sdp->sd_sc_inode); > fail: > - if (pn) > - iput(pn); > + iput(pn); > return error; > } >