Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f65985e authored by Julia Lawall's avatar Julia Lawall Committed by Mike Snitzer
Browse files

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

Remove DM's unneeded NULL tests before calling these destroy functions,
now that they check for NULL, thanks to these v4.3 commits:
3942d299 ("mm/slab_common: allow NULL cache pointer in kmem_cache_destroy()")
4e3ca3e0 ("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: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 71cdb697

drivers/md/dm-bufio.c

+2 −6
Original line number Diff line number Diff line
@@ -1861,12 +1861,8 @@ static void __exit dm_bufio_exit(void) 
	cancel_delayed_work_sync(&dm_bufio_work);

	destroy_workqueue(dm_bufio_wq);



	for (i = 0; i < ARRAY_SIZE(dm_bufio_caches); i++) {

		struct kmem_cache *kc = dm_bufio_caches[i];



		if (kc)

			kmem_cache_destroy(kc);

	}

	for (i = 0; i < ARRAY_SIZE(dm_bufio_caches); i++)

		kmem_cache_destroy(dm_bufio_caches[i]);



	for (i = 0; i < ARRAY_SIZE(dm_bufio_cache_names); i++)

		kfree(dm_bufio_cache_names[i]);

drivers/md/dm-cache-target.c

+1 −2
Original line number Diff line number Diff line
@@ -2309,7 +2309,6 @@ static void destroy(struct cache *cache) 
{

	unsigned i;



	if (cache->migration_pool)

	mempool_destroy(cache->migration_pool);



	if (cache->all_io_ds)

drivers/md/dm-crypt.c

+2 −4
Original line number Diff line number Diff line
@@ -1544,9 +1544,7 @@ static void crypt_dtr(struct dm_target *ti) 
	if (cc->bs)

		bioset_free(cc->bs);



	if (cc->page_pool)

	mempool_destroy(cc->page_pool);

	if (cc->req_pool)

	mempool_destroy(cc->req_pool);



	if (cc->iv_gen_ops && cc->iv_gen_ops->dtr)

drivers/md/dm-io.c

+1 −2
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ struct dm_io_client *dm_io_client_create(void) 
	return client;



   bad:

	if (client->pool)

	mempool_destroy(client->pool);

	kfree(client);

	return ERR_PTR(-ENOMEM);

drivers/md/dm-log-userspace-base.c

+1 −2
Original line number Diff line number Diff line
@@ -313,7 +313,6 @@ static int userspace_ctr(struct dm_dirty_log *log, struct dm_target *ti, 
out:

	kfree(devices_rdata);

	if (r) {

		if (lc->flush_entry_pool)

		mempool_destroy(lc->flush_entry_pool);

		kfree(lc);

		kfree(ctr_str);