From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754048AbbINQZU (ORCPT ); Mon, 14 Sep 2015 12:25:20 -0400 Received: from mail-ob0-f178.google.com ([209.85.214.178]:35245 "EHLO mail-ob0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752209AbbINQZR (ORCPT ); Mon, 14 Sep 2015 12:25:17 -0400 MIME-Version: 1.0 In-Reply-To: <20150914160710.GB5338@fieldses.org> References: <1442146532-9100-1-git-send-email-Julia.Lawall@lip6.fr> <1442146532-9100-15-git-send-email-Julia.Lawall@lip6.fr> <20150914160710.GB5338@fieldses.org> Date: Mon, 14 Sep 2015 12:25:16 -0400 Message-ID: Subject: Re: [PATCH 14/39] SUNRPC: drop null test before destroy functions From: Trond Myklebust To: "J. Bruce Fields" Cc: Julia Lawall , sergey.senozhatsky@gmail.com, Kernel Janitors Mailing List , Jeff Layton , Anna Schumaker , "David S. Miller" , Linux NFS Mailing List , Linux Network Devel Mailing List , Linux Kernel Mailing List Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Sep 14, 2015 at 12:07 PM, J. Bruce Fields 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/) >> >> // >> @@ expression x; @@ >> -if (x != NULL) >> \(kmem_cache_destroy\|mempool_destroy\|dma_pool_destroy\)(x); >> // >> >> Signed-off-by: Julia Lawall >> >> --- >> 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); >> } >> From mboxrd@z Thu Jan 1 00:00:00 1970 From: Trond Myklebust Date: Mon, 14 Sep 2015 16:25:16 +0000 Subject: Re: [PATCH 14/39] SUNRPC: drop null test before destroy functions Message-Id: List-Id: References: <1442146532-9100-1-git-send-email-Julia.Lawall@lip6.fr> <1442146532-9100-15-git-send-email-Julia.Lawall@lip6.fr> <20150914160710.GB5338@fieldses.org> In-Reply-To: <20150914160710.GB5338@fieldses.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: "J. Bruce Fields" Cc: Julia Lawall , sergey.senozhatsky@gmail.com, Kernel Janitors Mailing List , Jeff Layton , Anna Schumaker , "David S. Miller" , Linux NFS Mailing List , Linux Network Devel Mailing List , Linux Kernel Mailing List On Mon, Sep 14, 2015 at 12:07 PM, J. Bruce Fields 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/) >> >> // >> @@ expression x; @@ >> -if (x != NULL) >> \(kmem_cache_destroy\|mempool_destroy\|dma_pool_destroy\)(x); >> // >> >> Signed-off-by: Julia Lawall >> >> --- >> 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); >> } >>