Commit 22a4e061 authored by Rakesh Pandit's avatar Rakesh Pandit Committed by Jens Axboe

lightnvm: pblk: fix releases of kmem cache in error path

If pblk_core_init fails lets destroy all global caches.
Signed-off-by: default avatarRakesh Pandit <rakesh@tuxera.com>
Signed-off-by: default avatarMatias Bjørling <m@bjorling.me>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 05ed3447
...@@ -220,6 +220,14 @@ static int pblk_init_global_caches(struct pblk *pblk) ...@@ -220,6 +220,14 @@ static int pblk_init_global_caches(struct pblk *pblk)
return 0; return 0;
} }
static void pblk_free_global_caches(struct pblk *pblk)
{
kmem_cache_destroy(pblk_ws_cache);
kmem_cache_destroy(pblk_rec_cache);
kmem_cache_destroy(pblk_g_rq_cache);
kmem_cache_destroy(pblk_w_rq_cache);
}
static int pblk_core_init(struct pblk *pblk) static int pblk_core_init(struct pblk *pblk)
{ {
struct nvm_tgt_dev *dev = pblk->dev; struct nvm_tgt_dev *dev = pblk->dev;
...@@ -235,7 +243,7 @@ static int pblk_core_init(struct pblk *pblk) ...@@ -235,7 +243,7 @@ static int pblk_core_init(struct pblk *pblk)
pblk->page_bio_pool = mempool_create_page_pool(nvm_max_phys_sects(dev), pblk->page_bio_pool = mempool_create_page_pool(nvm_max_phys_sects(dev),
0); 0);
if (!pblk->page_bio_pool) if (!pblk->page_bio_pool)
return -ENOMEM; goto free_global_caches;
pblk->gen_ws_pool = mempool_create_slab_pool(PBLK_GEN_WS_POOL_SIZE, pblk->gen_ws_pool = mempool_create_slab_pool(PBLK_GEN_WS_POOL_SIZE,
pblk_ws_cache); pblk_ws_cache);
...@@ -303,6 +311,8 @@ static int pblk_core_init(struct pblk *pblk) ...@@ -303,6 +311,8 @@ static int pblk_core_init(struct pblk *pblk)
mempool_destroy(pblk->gen_ws_pool); mempool_destroy(pblk->gen_ws_pool);
free_page_bio_pool: free_page_bio_pool:
mempool_destroy(pblk->page_bio_pool); mempool_destroy(pblk->page_bio_pool);
free_global_caches:
pblk_free_global_caches(pblk);
return -ENOMEM; return -ENOMEM;
} }
...@@ -324,10 +334,7 @@ static void pblk_core_free(struct pblk *pblk) ...@@ -324,10 +334,7 @@ static void pblk_core_free(struct pblk *pblk)
mempool_destroy(pblk->e_rq_pool); mempool_destroy(pblk->e_rq_pool);
mempool_destroy(pblk->w_rq_pool); mempool_destroy(pblk->w_rq_pool);
kmem_cache_destroy(pblk_ws_cache); pblk_free_global_caches(pblk);
kmem_cache_destroy(pblk_rec_cache);
kmem_cache_destroy(pblk_g_rq_cache);
kmem_cache_destroy(pblk_w_rq_cache);
} }
static void pblk_luns_free(struct pblk *pblk) static void pblk_luns_free(struct pblk *pblk)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment