From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423028AbcBQNdG (ORCPT ); Wed, 17 Feb 2016 08:33:06 -0500 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:32132 "EHLO mail3-relais-sop.national.inria.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423002AbcBQNdB (ORCPT ); Wed, 17 Feb 2016 08:33:01 -0500 X-IronPort-AV: E=Sophos;i="5.22,460,1449529200"; d="scan'208";a="165043512" Date: Wed, 17 Feb 2016 08:32:56 -0500 (EST) From: Julia Lawall X-X-Sender: jll@hadrien To: Jaegeuk Kim cc: kbuild-all@01.org, "Theodore Ts'o" , Michael Halcrow , Ildar Muslukhov , linux-kernel@vger.kernel.org Subject: [PATCH] fs crypto: fix ifnullfree.cocci warnings Message-ID: User-Agent: Alpine 2.10 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org NULL check before some freeing functions is not needed. Generated by: scripts/coccinelle/free/ifnullfree.cocci Signed-off-by: Fengguang Wu Signed-off-by: Julia Lawall --- crypto.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) --- a/fs/crypto/crypto.c +++ b/fs/crypto/crypto.c @@ -414,8 +414,7 @@ static void fscrypt_destroy(void) list_for_each_entry_safe(pos, n, &fscrypt_free_ctxs, free_list) kmem_cache_free(fscrypt_ctx_cachep, pos); INIT_LIST_HEAD(&fscrypt_free_ctxs); - if (fscrypt_bounce_page_pool) - mempool_destroy(fscrypt_bounce_page_pool); + mempool_destroy(fscrypt_bounce_page_pool); fscrypt_bounce_page_pool = NULL; } @@ -500,9 +499,7 @@ void __exit fscrypt_exit(void) if (fscrypt_read_workqueue) destroy_workqueue(fscrypt_read_workqueue); - if (fscrypt_ctx_cachep) - kmem_cache_destroy(fscrypt_ctx_cachep); - if (fscrypt_info_cachep) - kmem_cache_destroy(fscrypt_info_cachep); + kmem_cache_destroy(fscrypt_ctx_cachep); + kmem_cache_destroy(fscrypt_info_cachep); } module_exit(fscrypt_exit);