From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757705AbbBEOco (ORCPT ); Thu, 5 Feb 2015 09:32:44 -0500 Received: from mail-bn1bon0097.outbound.protection.outlook.com ([157.56.111.97]:54720 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753047AbbBEOcm (ORCPT ); Thu, 5 Feb 2015 09:32:42 -0500 X-Greylist: delayed 10420 seconds by postgrey-1.27 at vger.kernel.org; Thu, 05 Feb 2015 09:32:42 EST X-AuditID: ac160a68-f79346d0000011e2-f0-54d37f046357 Message-ID: <54D37F01.7070709@sandisk.com> Date: Thu, 5 Feb 2015 15:32:33 +0100 From: Bart Van Assche User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: SF Markus Elfring , Hal Rosenstock , Roland Dreier , Sean Hefty , CC: LKML , , Julia Lawall Subject: Re: [PATCH] InfiniBand: Delete unnecessary checks before the function, call "srp_destroy_fr_pool" 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> <54D36190.1050407@users.sourceforge.net> In-Reply-To: <54D36190.1050407@users.sourceforge.net> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprJIsWRmVeSWpSXmKPExsWyRoxnkS5L/eUQg839ghbnO5czW2zcPJHR YtmD04wWW29JW1zeNYfN4tmhXhaLnQ0NTBbN6zewOHB47Jx1l91j8Z6XTB6bVnWyeezdkuXR dKqd1ePzJrkAtigum5TUnMyy1CJ9uwSujMVrl7AUrOeraLx7i7mB8RZ3FyMnh4SAicSx1S8Z IWwxiQv31rN1MXJxCAmcYJTovdTPCOFsZ5Q4Pv00O0zHzXPrmCASmxkl5h9+zwKS4BXQkli1 bxcziM0ioCLx+95WsDibgJHEt/czwWxRgTCJ75t3MEPUC0qcnPmEBWSQCMi6L98egW1gFiiU aDp1EqxBWCBH4seS28wQ266zSbxc/gusm1PAVOLCrbPMEA0GEkcWzWGFsOUltr+dA9YgIfCQ VeL452tgCSEBdYmTS+YzTWAUmYVk+ywk/bOQ9C9gZF7FKJabmVOcm55aYGioV5yYl5JZnK2X nJ+7iREcYVwZOxi3TjI/xCjAwajEw/tg96UQIdbEsuLK3EOMEhzMSiK8bpWXQ4R4UxIrq1KL 8uOLSnNSiw8xSnOwKInz2s/L8hcSSE8sSc1OTS1ILYLJMnFwSjUwzuhTruyLfJnye72gyt8t Ew5nTDvy69GXucoZBYo/7CPTUzuU216+YNnAfOXS+k0f1h6f7CacvT19cUPzxAKnAx/+zZ6g /l9k+Q+LQ/Vd4owX3q3x9TzXrv6EbWehwO+ibhb/EzdkOSwfMHSJfZriVt4qsdbuR51K89k9 F1b0SoW/2WD++pDvBCWW4oxEQy3mouJEAL8+aTSsAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjluLIzCtJLcpLzFFi42Lh2siRostSfznEYOImdovzncuZLTZunsho sezBaUaLrbekLS7vmsNm8exQL4vFzoYGJovm9RtYHDg8ds66y+6xeM9LJo9NqzrZPPZuyfJo OtXO6vF5k1wAWxSXTUpqTmZZapG+XQJXxuK1S1gK1vNVNN69xdzAeIu7i5GTQ0LAROLmuXVM ELaYxIV769m6GLk4hAQ2MkpsOfaRESTBK6AlsWrfLmYQm0VAVeLK5BNgNpuAkcS39zNZQGxR gTCJ75t3MEPUC0qcnPmEBWSQiMApRomFV16CDWIWKJB4efoPK4gtLJAj8WPJbWaIbdfZJF4u /wXWzSlgKnHh1llmiAY9iR3Xf7FC2PIS29/OYZ7AyD8LyZJZSMpmISlbwMi8ilEsNzOnODc9 s8DQSK84MS8lszhbLzk/dxMjOMQ5o3YwXp9ofoiRiYNTqoFR6PFE21VTSwQv201t4d3sqFgj O6f8zAPp3dY7Pm59qqwdFutpzTglXXXJ5oZdk05O+RzAcbtvrobz16s8OxynVOf8E/SJ5tFb qWifsip0y1yLjZ9MtOQ3Rn9trFmgrOhYWng9znTusQum718lSq+4l3H58BzLhDyJnf6Hrh3f /CM46k0088LfSizFGYmGWsxFxYkAB2IL1iECAAA= X-EOPAttributedMessage: 0 Authentication-Results: spf=pass (sender IP is 63.163.107.172) smtp.mailfrom=Bart.VanAssche@sandisk.com; users.sourceforge.net; dkim=none (message not signed) header.d=none; X-Forefront-Antispam-Report: CIP:63.163.107.172;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(438002)(51704005)(479174004)(24454002)(77096005)(92566002)(47776003)(2950100001)(33656002)(87936001)(19580405001)(19580395003)(65806001)(106466001)(83506001)(86362001)(36756003)(76176999)(54356999)(50986999)(65816999)(87266999)(46102003)(93886004)(62966003)(23746002)(77156002)(50466002);DIR:OUT;SFP:1101;SCL:1;SRVR:BLUPR02MB113;H:milsmgep11.sandisk.com;FPR:;SPF:Pass;MLV:sfv;LANG:en; X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:BLUPR02MB113; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004);SRVR:BLUPR02MB113; X-Forefront-PRVS: 0478C23FE0 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:;SRVR:BLUPR02MB113; X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2015 14:32:36.6501 (UTC) X-MS-Exchange-CrossTenant-Id: fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d;Ip=[63.163.107.172] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR02MB113 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/05/15 13:26, SF Markus Elfring wrote: > From: Markus Elfring > Date: Thu, 5 Feb 2015 13:20:42 +0100 > > The srp_destroy_fr_pool() 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 > --- > drivers/infiniband/ulp/srp/ib_srp.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c > index 0747c05..6f5dfa1 100644 > --- a/drivers/infiniband/ulp/srp/ib_srp.c > +++ b/drivers/infiniband/ulp/srp/ib_srp.c > @@ -549,8 +549,7 @@ static int srp_create_ch_ib(struct srp_rdma_ch *ch) > "FR pool allocation failed (%d)\n", ret); > goto err_qp; > } > - if (ch->fr_pool) > - srp_destroy_fr_pool(ch->fr_pool); > + srp_destroy_fr_pool(ch->fr_pool); > ch->fr_pool = fr_pool; > } else if (!dev->use_fast_reg && dev->has_fmr) { > fmr_pool = srp_alloc_fmr_pool(target); > @@ -615,13 +614,12 @@ static void srp_free_ch_ib(struct srp_target_port *target, > if (!ch->qp) > return; > > - if (dev->use_fast_reg) { > - if (ch->fr_pool) > - srp_destroy_fr_pool(ch->fr_pool); > - } else { > + if (dev->use_fast_reg) > + srp_destroy_fr_pool(ch->fr_pool); > + else > if (ch->fmr_pool) > ib_destroy_fmr_pool(ch->fmr_pool); > - } > + > srp_destroy_qp(ch); > ib_destroy_cq(ch->send_cq); > ib_destroy_cq(ch->recv_cq); This patch makes the code in srp_free_ch_ib() asymmetric which is unfortunate. Please add a test in ib_destroy_fmr_pool() such that the check before ib_destroy_fmr_pool() can also be eliminated. Bart.