From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751489AbbEBJOt (ORCPT ); Sat, 2 May 2015 05:14:49 -0400 Received: from mx01-fr.bfs.de ([193.174.231.67]:54256 "EHLO mx01-fr.bfs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750807AbbEBJOp (ORCPT ); Sat, 2 May 2015 05:14:45 -0400 Message-ID: <5544957F.30009@bfs.de> Date: Sat, 02 May 2015 11:14:39 +0200 From: walter harms Reply-To: wharms@bfs.de User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; de; rv:1.9.1.16) Gecko/20101125 SUSE/3.0.11 Thunderbird/3.0.11 MIME-Version: 1.0 To: Julia Lawall CC: Oleg Drokin , kernel-janitors@vger.kernel.org, Andreas Dilger , Greg Kroah-Hartman , HPDD-discuss@ml01.01.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 19/20] staging: lustre: ptlrpc: sec_plain: remove unneeded null test before free References: <1430509086-22132-1-git-send-email-Julia.Lawall@lip6.fr> <1430509086-22132-3-git-send-email-Julia.Lawall@lip6.fr> In-Reply-To: <1430509086-22132-3-git-send-email-Julia.Lawall@lip6.fr> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Am 01.05.2015 21:37, schrieb Julia Lawall: > Kfree can cope with a null argument, so drop null tests. > > The semantic patch that makes this change is as follows: > (http://coccinelle.lip6.fr/) > > // > @@ expression ptr; @@ > > - if (ptr != NULL) > kfree(ptr); > // > > Signed-off-by: Julia Lawall > > --- > drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_plain.c b/drivers/staging/lustre/lustre/ptlrpc/sec_plain.c > index 604e511..989cdcd 100644 > --- a/drivers/staging/lustre/lustre/ptlrpc/sec_plain.c > +++ b/drivers/staging/lustre/lustre/ptlrpc/sec_plain.c > @@ -384,8 +384,7 @@ struct ptlrpc_cli_ctx *plain_sec_install_ctx(struct plain_sec *plsec) > if (ctx) { > atomic_inc(&ctx->cc_refcount); > > - if (ctx_new) > - kfree(ctx_new); > + kfree(ctx_new); > } else if (ctx_new) { > ctx = ctx_new; > The error handling here is not obvious the OBD_ALLOC_PTR(ctx_new); should have something like if (!ctx_new) return NULL; just my 2 cents re, wh > -- > To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >