From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755652AbbIMMdz (ORCPT ); Sun, 13 Sep 2015 08:33:55 -0400 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:50399 "EHLO mail3-relais-sop.national.inria.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753534AbbIMM0E (ORCPT ); Sun, 13 Sep 2015 08:26:04 -0400 X-IronPort-AV: E=Sophos;i="5.17,522,1437429600"; d="scan'208";a="145607436" From: Julia Lawall To: Kent Overstreet Cc: sergey.senozhatsky@gmail.com, kernel-janitors@vger.kernel.org, Neil Brown , linux-bcache@vger.kernel.org, linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 15/39] bcache: drop null test before destroy functions Date: Sun, 13 Sep 2015 14:15:08 +0200 Message-Id: <1442146532-9100-16-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 --- drivers/md/bcache/bset.c | 3 +-- drivers/md/bcache/request.c | 3 +-- drivers/md/bcache/super.c | 9 +++------ 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c index 8e9877b..bd4678c 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c @@ -1145,8 +1145,7 @@ void bch_flash_dev_request_init(struct bcache_device *d) void bch_request_exit(void) { - if (bch_search_cache) - kmem_cache_destroy(bch_search_cache); + kmem_cache_destroy(bch_search_cache); } int __init bch_request_init(void) diff --git a/drivers/md/bcache/bset.c b/drivers/md/bcache/bset.c index 646fe85..479117c 100644 --- a/drivers/md/bcache/bset.c +++ b/drivers/md/bcache/bset.c @@ -1116,8 +1116,7 @@ struct bkey *bch_btree_iter_next_filter(struct btree_iter *iter, void bch_bset_sort_state_free(struct bset_sort_state *state) { - if (state->pool) - mempool_destroy(state->pool); + mempool_destroy(state->pool); } int bch_bset_sort_state_init(struct bset_sort_state *state, unsigned page_order) diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index 679a093..c27a0ff 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -1335,12 +1335,9 @@ static void cache_set_free(struct closure *cl) destroy_workqueue(c->moving_gc_wq); if (c->bio_split) bioset_free(c->bio_split); - if (c->fill_iter) - mempool_destroy(c->fill_iter); - if (c->bio_meta) - mempool_destroy(c->bio_meta); - if (c->search) - mempool_destroy(c->search); + mempool_destroy(c->fill_iter); + mempool_destroy(c->bio_meta); + mempool_destroy(c->search); kfree(c->devices); mutex_lock(&bch_register_lock); From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julia Lawall Date: Sun, 13 Sep 2015 12:15:08 +0000 Subject: [PATCH 15/39] bcache: drop null test before destroy functions Message-Id: <1442146532-9100-16-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: Kent Overstreet Cc: sergey.senozhatsky@gmail.com, kernel-janitors@vger.kernel.org, Neil Brown , linux-bcache@vger.kernel.org, linux-raid@vger.kernel.org, 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 --- drivers/md/bcache/bset.c | 3 +-- drivers/md/bcache/request.c | 3 +-- drivers/md/bcache/super.c | 9 +++------ 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c index 8e9877b..bd4678c 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c @@ -1145,8 +1145,7 @@ void bch_flash_dev_request_init(struct bcache_device *d) void bch_request_exit(void) { - if (bch_search_cache) - kmem_cache_destroy(bch_search_cache); + kmem_cache_destroy(bch_search_cache); } int __init bch_request_init(void) diff --git a/drivers/md/bcache/bset.c b/drivers/md/bcache/bset.c index 646fe85..479117c 100644 --- a/drivers/md/bcache/bset.c +++ b/drivers/md/bcache/bset.c @@ -1116,8 +1116,7 @@ struct bkey *bch_btree_iter_next_filter(struct btree_iter *iter, void bch_bset_sort_state_free(struct bset_sort_state *state) { - if (state->pool) - mempool_destroy(state->pool); + mempool_destroy(state->pool); } int bch_bset_sort_state_init(struct bset_sort_state *state, unsigned page_order) diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index 679a093..c27a0ff 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -1335,12 +1335,9 @@ static void cache_set_free(struct closure *cl) destroy_workqueue(c->moving_gc_wq); if (c->bio_split) bioset_free(c->bio_split); - if (c->fill_iter) - mempool_destroy(c->fill_iter); - if (c->bio_meta) - mempool_destroy(c->bio_meta); - if (c->search) - mempool_destroy(c->search); + mempool_destroy(c->fill_iter); + mempool_destroy(c->bio_meta); + mempool_destroy(c->search); kfree(c->devices); mutex_lock(&bch_register_lock);