From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755307AbbIMM1j (ORCPT ); Sun, 13 Sep 2015 08:27:39 -0400 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:60449 "EHLO mail3-relais-sop.national.inria.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754427AbbIMM0O (ORCPT ); Sun, 13 Sep 2015 08:26:14 -0400 X-IronPort-AV: E=Sophos;i="5.17,522,1437429600"; d="scan'208";a="145607460" From: Julia Lawall To: Jaegeuk Kim Cc: sergey.senozhatsky@gmail.com, kernel-janitors@vger.kernel.org, Changman Lee , Chao Yu , linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH 37/39] f2fs crypto: drop null test before destroy functions Date: Sun, 13 Sep 2015 14:15:30 +0200 Message-Id: <1442146532-9100-38-git-send-email-Julia.Lawall@lip6.fr> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1442146532-9100-1-git-send-email-Julia.Lawall@lip6.fr> References: <1442146532-9100-1-git-send-email-Julia.Lawall@lip6.fr> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- fs/f2fs/crypto.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/fs/f2fs/crypto.c b/fs/f2fs/crypto.c index 4a62ef1..3c27f04 100644 --- a/fs/f2fs/crypto.c +++ b/fs/f2fs/crypto.c @@ -183,8 +183,7 @@ static void f2fs_crypto_destroy(void) list_for_each_entry_safe(pos, n, &f2fs_free_crypto_ctxs, free_list) kmem_cache_free(f2fs_crypto_ctx_cachep, pos); INIT_LIST_HEAD(&f2fs_free_crypto_ctxs); - if (f2fs_bounce_page_pool) - mempool_destroy(f2fs_bounce_page_pool); + mempool_destroy(f2fs_bounce_page_pool); f2fs_bounce_page_pool = NULL; } @@ -240,10 +239,8 @@ void f2fs_exit_crypto(void) if (f2fs_read_workqueue) destroy_workqueue(f2fs_read_workqueue); - if (f2fs_crypto_ctx_cachep) - kmem_cache_destroy(f2fs_crypto_ctx_cachep); - if (f2fs_crypt_info_cachep) - kmem_cache_destroy(f2fs_crypt_info_cachep); + kmem_cache_destroy(f2fs_crypto_ctx_cachep); + kmem_cache_destroy(f2fs_crypt_info_cachep); } int __init f2fs_init_crypto(void) From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julia Lawall Date: Sun, 13 Sep 2015 12:15:30 +0000 Subject: [PATCH 37/39] f2fs crypto: drop null test before destroy functions Message-Id: <1442146532-9100-38-git-send-email-Julia.Lawall@lip6.fr> List-Id: References: <1442146532-9100-1-git-send-email-Julia.Lawall@lip6.fr> In-Reply-To: <1442146532-9100-1-git-send-email-Julia.Lawall@lip6.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Jaegeuk Kim Cc: sergey.senozhatsky@gmail.com, kernel-janitors@vger.kernel.org, Changman Lee , Chao Yu , linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org 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 --- fs/f2fs/crypto.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/fs/f2fs/crypto.c b/fs/f2fs/crypto.c index 4a62ef1..3c27f04 100644 --- a/fs/f2fs/crypto.c +++ b/fs/f2fs/crypto.c @@ -183,8 +183,7 @@ static void f2fs_crypto_destroy(void) list_for_each_entry_safe(pos, n, &f2fs_free_crypto_ctxs, free_list) kmem_cache_free(f2fs_crypto_ctx_cachep, pos); INIT_LIST_HEAD(&f2fs_free_crypto_ctxs); - if (f2fs_bounce_page_pool) - mempool_destroy(f2fs_bounce_page_pool); + mempool_destroy(f2fs_bounce_page_pool); f2fs_bounce_page_pool = NULL; } @@ -240,10 +239,8 @@ void f2fs_exit_crypto(void) if (f2fs_read_workqueue) destroy_workqueue(f2fs_read_workqueue); - if (f2fs_crypto_ctx_cachep) - kmem_cache_destroy(f2fs_crypto_ctx_cachep); - if (f2fs_crypt_info_cachep) - kmem_cache_destroy(f2fs_crypt_info_cachep); + kmem_cache_destroy(f2fs_crypto_ctx_cachep); + kmem_cache_destroy(f2fs_crypt_info_cachep); } int __init f2fs_init_crypto(void)