From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755133AbbINJIX (ORCPT ); Mon, 14 Sep 2015 05:08:23 -0400 Received: from mx2.suse.de ([195.135.220.15]:46668 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755013AbbINJIV convert rfc822-to-8bit (ORCPT ); Mon, 14 Sep 2015 05:08:21 -0400 From: Johannes Thumshirn To: Julia Lawall Cc: Kent Overstreet , 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: Re: [PATCH 15/39] bcache: drop null test before destroy functions References: <1442146532-9100-1-git-send-email-Julia.Lawall@lip6.fr> <1442146532-9100-16-git-send-email-Julia.Lawall@lip6.fr> Date: Mon, 14 Sep 2015 11:08:18 +0200 In-Reply-To: <1442146532-9100-16-git-send-email-Julia.Lawall@lip6.fr> (Julia Lawall's message of "Sun, 13 Sep 2015 14:15:08 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Julia Lawall writes: > 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 Reviewed-by: Johannes Thumshirn > > --- > 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); > > -- > To unsubscribe from this list: send the line "unsubscribe linux-bcache" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Johannes Thumshirn Storage jthumshirn@suse.de +49 911 74053 689 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG Nürnberg) Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Thumshirn Date: Mon, 14 Sep 2015 09:08:18 +0000 Subject: Re: [PATCH 15/39] bcache: drop null test before destroy functions Message-Id: List-Id: References: <1442146532-9100-1-git-send-email-Julia.Lawall@lip6.fr> <1442146532-9100-16-git-send-email-Julia.Lawall@lip6.fr> In-Reply-To: <1442146532-9100-16-git-send-email-Julia.Lawall@lip6.fr> (Julia Lawall's message of "Sun, 13 Sep 2015 14:15:08 +0200") MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: Julia Lawall Cc: Kent Overstreet , 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 Julia Lawall writes: > 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 Reviewed-by: Johannes Thumshirn > > --- > 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); > > -- > To unsubscribe from this list: send the line "unsubscribe linux-bcache" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Johannes Thumshirn Storage jthumshirn@suse.de +49 911 74053 689 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG Nürnberg) Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850