From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751595AbdB0Tv6 (ORCPT ); Mon, 27 Feb 2017 14:51:58 -0500 Received: from smtprelay0157.hostedemail.com ([216.40.44.157]:45860 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751285AbdB0Tv5 (ORCPT ); Mon, 27 Feb 2017 14:51:57 -0500 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::::::::,RULES_HIT:41:355:379:541:599:800:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:2393:2559:2562:2828:3138:3139:3140:3141:3142:3353:3622:3865:3871:3874:4321:4605:5007:7514:10004:10400:10848:11026:11232:11473:11657:11658:11914:12043:12296:12438:12555:12740:12760:12895:13069:13311:13357:13439:14096:14097:14181:14659:14721:14877:21080:21451:30054:30080:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:4,LUA_SUMMARY:none X-HE-Tag: dad80_4d5df765b7a05 X-Filterd-Recvd-Size: 2657 Message-ID: <1488223529.25838.8.camel@perches.com> Subject: Re: [PATCH 1/5] staging: lustre: Remove unnecessary else after return From: Joe Perches To: simran singhal , gregkh@linuxfoundation.org Cc: lustre-devel@lists.lustre.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-fbdev@vger.kernel.org, outreachy-kernel@googlegroups.com Date: Mon, 27 Feb 2017 11:25:29 -0800 In-Reply-To: <1488219268-3006-1-git-send-email-singhalsimran0@gmail.com> References: <1488219268-3006-1-git-send-email-singhalsimran0@gmail.com> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.22.3-0ubuntu0.1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2017-02-27 at 23:44 +0530, simran singhal wrote: > This patch fixes the checkpatch warning that else is not generally > useful after a break or return. checkpatch doesn't actually warn for this style if (foo) return bar; else return baz; > @@ > expression e2; > statement s1; > @@ > if(e2) { ... return ...; } > -else > s1 > > Signed-off-by: simran singhal > --- > drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c | 3 +-- > drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 3 +-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c > index fbbd8a5..02d49b7 100644 > --- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c > +++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c > @@ -1806,8 +1806,7 @@ ksocknal_close_matching_conns(struct lnet_process_id id, __u32 ipaddr) > > if (!count) > return -ENOENT; > - else > - return 0; > + return 0; > } > > void > diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c > index cf3fc57..ac32c82 100644 > --- a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c > +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c > @@ -338,8 +338,7 @@ static int ldlm_cli_pool_shrink(struct ldlm_pool *pl, > > if (nr == 0) > return (unused / 100) * sysctl_vfs_cache_pressure; > - else > - return ldlm_cancel_lru(ns, nr, LCF_ASYNC, LDLM_LRU_FLAG_SHRINK); > + return ldlm_cancel_lru(ns, nr, LCF_ASYNC, LDLM_LRU_FLAG_SHRINK); > } > > static const struct ldlm_pool_ops ldlm_cli_pool_ops = {