Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 12:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

dm: drop NULL test before kmem_cache_destroy() and mempool_destroy()

Browse Source 
Remove DM's unneeded NULL tests before calling these destroy functions,
now that they check for NULL, thanks to these v4.3 commits:
3942d2991 ("mm/slab_common: allow NULL cache pointer in kmem_cache_destroy()")
4e3ca3e03 ("mm/mempool: allow NULL `pool' pointer in mempool_destroy()")

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@ expression x; @@
-if (x != NULL)
  \(kmem_cache_destroy\|mempool_destroy\|dma_pool_destroy\)(x);
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
This commit is contained in:
Julia Lawall 2015-09-13 14:15:05 +02:00 committed by Mike Snitzer
parent 71cdb6978a
commit 6f65985e26
7 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/md/dm-bufio.c
View File

@ -1861,12 +1861,8 @@ static void __exit dm_bufio_exit(void)
cancel_delayed_work_sync(&dm_bufio_work); cancel_delayed_work_sync(&dm_bufio_work);
destroy_workqueue(dm_bufio_wq); destroy_workqueue(dm_bufio_wq);
for (i = 0; i < ARRAY_SIZE(dm_bufio_caches); i++) { for (i = 0; i < ARRAY_SIZE(dm_bufio_caches); i++)
struct kmem_cache *kc = dm_bufio_caches[i]; kmem_cache_destroy(dm_bufio_caches[i]);
if (kc)
kmem_cache_destroy(kc);
}
for (i = 0; i < ARRAY_SIZE(dm_bufio_cache_names); i++) for (i = 0; i < ARRAY_SIZE(dm_bufio_cache_names); i++)
kfree(dm_bufio_cache_names[i]); kfree(dm_bufio_cache_names[i]);

3
drivers/md/dm-cache-target.c
View File

@ -2309,8 +2309,7 @@ static void destroy(struct cache *cache)
{ {
unsigned i; unsigned i;
if (cache->migration_pool) mempool_destroy(cache->migration_pool);
mempool_destroy(cache->migration_pool);
if (cache->all_io_ds) if (cache->all_io_ds)
dm_deferred_set_destroy(cache->all_io_ds); dm_deferred_set_destroy(cache->all_io_ds);

6
drivers/md/dm-crypt.c
View File

@ -1544,10 +1544,8 @@ static void crypt_dtr(struct dm_target *ti)
if (cc->bs) if (cc->bs)
bioset_free(cc->bs); bioset_free(cc->bs);
if (cc->page_pool) mempool_destroy(cc->page_pool);
mempool_destroy(cc->page_pool); mempool_destroy(cc->req_pool);
if (cc->req_pool)
mempool_destroy(cc->req_pool);
if (cc->iv_gen_ops && cc->iv_gen_ops->dtr) if (cc->iv_gen_ops && cc->iv_gen_ops->dtr)
cc->iv_gen_ops->dtr(cc); cc->iv_gen_ops->dtr(cc);

3
drivers/md/dm-io.c
View File

@ -65,8 +65,7 @@ struct dm_io_client *dm_io_client_create(void)
return client; return client;
bad: bad:
if (client->pool) mempool_destroy(client->pool);
mempool_destroy(client->pool);
kfree(client); kfree(client);
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
} }

3
drivers/md/dm-log-userspace-base.c
View File

@ -313,8 +313,7 @@ static int userspace_ctr(struct dm_dirty_log *log, struct dm_target *ti,
out: out:
kfree(devices_rdata); kfree(devices_rdata);
if (r) { if (r) {
if (lc->flush_entry_pool) mempool_destroy(lc->flush_entry_pool);
mempool_destroy(lc->flush_entry_pool);
kfree(lc); kfree(lc);
kfree(ctr_str); kfree(ctr_str);
} else { } else {

4
drivers/md/dm-region-hash.c
View File

@ -249,9 +249,7 @@ void dm_region_hash_destroy(struct dm_region_hash *rh)
if (rh->log) if (rh->log)
dm_dirty_log_destroy(rh->log); dm_dirty_log_destroy(rh->log);
if (rh->region_pool) mempool_destroy(rh->region_pool);
mempool_destroy(rh->region_pool);
vfree(rh->buckets); vfree(rh->buckets);
kfree(rh); kfree(rh);
} }

13
drivers/md/dm.c
View File

@ -2254,10 +2254,8 @@ static void cleanup_mapped_device(struct mapped_device *md)
destroy_workqueue(md->wq); destroy_workqueue(md->wq);
if (md->kworker_task) if (md->kworker_task)
kthread_stop(md->kworker_task); kthread_stop(md->kworker_task);
if (md->io_pool) mempool_destroy(md->io_pool);
mempool_destroy(md->io_pool); mempool_destroy(md->rq_pool);
if (md->rq_pool)
mempool_destroy(md->rq_pool);
if (md->bs) if (md->bs)
bioset_free(md->bs); bioset_free(md->bs);
@ -3542,11 +3540,8 @@ void dm_free_md_mempools(struct dm_md_mempools *pools)
if (!pools) if (!pools)
return; return;
if (pools->io_pool) mempool_destroy(pools->io_pool);
mempool_destroy(pools->io_pool); mempool_destroy(pools->rq_pool);
if (pools->rq_pool)
mempool_destroy(pools->rq_pool);
if (pools->bs) if (pools->bs)
bioset_free(pools->bs); bioset_free(pools->bs);