From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751863AbbFZMGM (ORCPT ); Fri, 26 Jun 2015 08:06:12 -0400 Received: from mout.web.de ([212.227.17.12]:58304 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751585AbbFZMGG (ORCPT ); Fri, 26 Jun 2015 08:06:06 -0400 Message-ID: <558D4024.60003@users.sourceforge.net> Date: Fri, 26 Jun 2015 14:05:56 +0200 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Christine Caulfield , David Teigland , cluster-devel@redhat.com CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH] fs-DLM: Delete unnecessary checks before the function call "kfree" 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> <5479FBA2.5020405@users.sourceforge.net> In-Reply-To: <5479FBA2.5020405@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:jbp2w0iP2J1q5PnZlOanEPQ4r7Thsf6XUWx3Hg23tj9OUxrDnf4 ynIiB0/w5cyhUURrSrr2zxZozQzUP5lmYOoT+Zs30h4oINSCYvRle8lLBg+PWqCw1UKpvgD 9B/UO9o36QSVffzWb/fOW3+WdqdOOJ/9Oy2IpB9cWfGEzsDsn3ODpFlCrpO8q238H5fWwat nSGsRdJhI9tAWz+QoHAPQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:U7vHvI71J40=:uQzEVvHut4N/Tv476fTTy6 eIELksxLOaWiN4mskQt/eDo7ANleCwK3mPMP7ZLupaxj5ATzA0lZK5x1SMtCNEyFmeq5BqUW+ SysKqoCtowLemFHQIi3UrDiZP3daXU6xNrtcUptmp2FTq145kG3cC8SOGwQIsoGCBj6SsyC6O JOVVkgq2pmiNFYLQid06II451d0Wx6eOtOu/4QXFZh8sYLJfTOdM6U3rs01S2bQzFGg13Gv8Z nC1t6oXcIp+vaIvvrmkgp5fp+/68VMjgHXDkAHln1xU36DdTYrkePn59ABjximVBM0W4H1716 fe00sEcOwNRLmEAvk+smb8KEJ5fkVOCFXCX2a3Pee9FjkrxrZYyHl1iZDv1S5ev2m8jJ4Uwss JSUEG6N++kUR1SQdD7AtS1L80m/UMF9tx2vANFKj1YoctsWq7FF5r4vjd3v4mUzmGDqUaiqnu 4jhlsiFlSVNQWluQV1B6HRjNejzr4pJUUubS00GWff7LrPwkJW5LnYXiHktuSP5w7E2M+8VJW iHDauh8NIOBTi9wdj6pFCh2grs8JJd4f/MQPWVkJ4oNomeBpQJh0PC7LJnJB8pbznDs2dmDnY Xff63huLD97SU84sGV11/fL/rNsrPhz+xj3g4j7vkD2DTbqv6JxIPdQ3gUzs5Z2YloOm89kH9 6+FfFPVZ2lnju0e44sadPRPXLjs1XK6Snfwon+pi6f4KO69s79VFXdPLG8n1HdjetAxg= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 26 Jun 2015 14:00:06 +0200 The kfree() function tests whether its argument is NULL and then returns 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/dlm/lockspace.c | 6 ++---- fs/dlm/memory.c | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c index f3e7278..41c53b3 100644 --- a/fs/dlm/lockspace.c +++ b/fs/dlm/lockspace.c @@ -673,10 +673,8 @@ static int new_lockspace(const char *name, const char *cluster, kfree(ls->ls_recover_buf); out_lkbidr: idr_destroy(&ls->ls_lkbidr); - for (i = 0; i < DLM_REMOVE_NAMES_MAX; i++) { - if (ls->ls_remove_names[i]) - kfree(ls->ls_remove_names[i]); - } + for (i = 0; i < DLM_REMOVE_NAMES_MAX; i++) + kfree(ls->ls_remove_names[i]); out_rsbtbl: vfree(ls->ls_rsbtbl); out_lsfree: diff --git a/fs/dlm/memory.c b/fs/dlm/memory.c index 7cd24bc..2d2eaa0 100644 --- a/fs/dlm/memory.c +++ b/fs/dlm/memory.c @@ -86,8 +86,7 @@ void dlm_free_lkb(struct dlm_lkb *lkb) struct dlm_user_args *ua; ua = lkb->lkb_ua; if (ua) { - if (ua->lksb.sb_lvbptr) - kfree(ua->lksb.sb_lvbptr); + kfree(ua->lksb.sb_lvbptr); kfree(ua); } } -- 2.4.4