Re: [PATCH 14/39] SUNRPC: drop null test before destroy functions

[Trond Myklebust]

On Mon, Sep 14, 2015 at 12:07 PM, J. Bruce Fields <bfields@xxxxxxxxxxxx> wrote:
> ACK, but assuming Trond takes this one.--b.

No problem. I'll pick it up...

Cheers
  Trond

> On Sun, Sep 13, 2015 at 02:15:07PM +0200, Julia Lawall wrote:
>> Remove unneeded NULL test.
>>
>> The semantic patch that makes this change is as follows:
>> (http://coccinelle.lip6.fr/)
>>
>> // <smpl>
>> @@ expression x; @@
>> -if (x != NULL)
>>   \(kmem_cache_destroy\|mempool_destroy\|dma_pool_destroy\)(x);
>> // </smpl>
>>
>> Signed-off-by: Julia Lawall <Julia.Lawall@xxxxxxx>
>>
>> ---
>>  net/sunrpc/sched.c |   12 ++++--------
>>  1 file changed, 4 insertions(+), 8 deletions(-)
>>
>> diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
>> index b140c09..425ca2f 100644
>> --- a/net/sunrpc/sched.c
>> +++ b/net/sunrpc/sched.c
>> @@ -1092,14 +1092,10 @@ void
>>  rpc_destroy_mempool(void)
>>  {
>>       rpciod_stop();
>> -     if (rpc_buffer_mempool)
>> -             mempool_destroy(rpc_buffer_mempool);
>> -     if (rpc_task_mempool)
>> -             mempool_destroy(rpc_task_mempool);
>> -     if (rpc_task_slabp)
>> -             kmem_cache_destroy(rpc_task_slabp);
>> -     if (rpc_buffer_slabp)
>> -             kmem_cache_destroy(rpc_buffer_slabp);
>> +     mempool_destroy(rpc_buffer_mempool);
>> +     mempool_destroy(rpc_task_mempool);
>> +     kmem_cache_destroy(rpc_task_slabp);
>> +     kmem_cache_destroy(rpc_buffer_slabp);
>>       rpc_destroy_wait_queue(&delay_queue);
>>  }
>>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/