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

[SIMRAN SINGHAL]

On Tue, Feb 28, 2017 at 12:55 AM, Joe Perches <joe@xxxxxxxxxxx> wrote:
> 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;
>
ok, My bad
so, I have to change commit message as checkpatch doesn't warn for this style.
>> @@
>> expression e2;
>> statement s1;
>> @@
>> if(e2) { ... return ...; }
>> -else
>>          s1
>>
>> Signed-off-by: simran singhal <singhalsimran0@xxxxxxxxx>
>> ---
>>  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 = {