diff options
| author | Julia Lawall <Julia.Lawall@lip6.fr> | 2015-09-13 14:15:05 +0200 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2015-11-01 00:06:00 +0100 |
| commit | 6f65985e2636c0b170eade6a72d216632f065e26 (patch) | |
| tree | 2f055892081b955b52b037db6628dd7e9c08b293 /drivers/md/dm.c | |
| parent | dm: add support for passing through persistent reservations (diff) | |
| download | linux-6f65985e2636c0b170eade6a72d216632f065e26.tar.xz linux-6f65985e2636c0b170eade6a72d216632f065e26.zip | |
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:
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>
Diffstat (limited to 'drivers/md/dm.c')
| -rw-r--r-- | drivers/md/dm.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index c31ca8bc6af5..95558432c080 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -2254,10 +2254,8 @@ static void cleanup_mapped_device(struct mapped_device *md) destroy_workqueue(md->wq); if (md->kworker_task) kthread_stop(md->kworker_task); - if (md->io_pool) - mempool_destroy(md->io_pool); - if (md->rq_pool) - mempool_destroy(md->rq_pool); + mempool_destroy(md->io_pool); + mempool_destroy(md->rq_pool); if (md->bs) bioset_free(md->bs); @@ -3542,11 +3540,8 @@ void dm_free_md_mempools(struct dm_md_mempools *pools) if (!pools) return; - if (pools->io_pool) - mempool_destroy(pools->io_pool); - - if (pools->rq_pool) - mempool_destroy(pools->rq_pool); + mempool_destroy(pools->io_pool); + mempool_destroy(pools->rq_pool); if (pools->bs) bioset_free(pools->bs); |