linux-kernel - Re: [PATCH 1/5] staging: lustre: Remove unnecessary else after return

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1488223529.25838.8.camel@perches.com>
Date:   Mon, 27 Feb 2017 11:25:29 -0800
From:   Joe Perches <joe@...ches.com>
To:     simran singhal <singhalsimran0@...il.com>,
        gregkh@...uxfoundation.org
Cc:     lustre-devel@...ts.lustre.org, devel@...verdev.osuosl.org,
        linux-kernel@...r.kernel.org, linux-fbdev@...r.kernel.org,
        outreachy-kernel@...glegroups.com
Subject: Re: [PATCH 1/5] staging: lustre: Remove unnecessary else after
 return

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 <singhalsimran0@...il.com>
> ---
>  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 = {