[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20171001132633.GA5783@hercules.tuxera.com>
Date: Sun, 1 Oct 2017 16:26:35 +0300
From: Rakesh Pandit <rakesh@...era.com>
To: Matias Bjørling <mb@...htnvm.io>,
<linux-block@...r.kernel.org>, <linux-kernel@...r.kernel.org>
CC: Javier González <jg@...htnvm.io>
Subject: [PATCH 6/6] lightnvm: pblk: fix releases of kmem cache in error path
If pblk_core_init fails lets destroy all global caches.
Signed-off-by: Rakesh Pandit <rakesh@...era.com>
---
drivers/lightnvm/pblk-init.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c
index 519e5cf..9f39800 100644
--- a/drivers/lightnvm/pblk-init.c
+++ b/drivers/lightnvm/pblk-init.c
@@ -246,7 +246,7 @@ static int pblk_core_init(struct pblk *pblk)
pblk->page_bio_pool = mempool_create_page_pool(nvm_max_phys_sects(dev),
0);
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_ws_cache);
@@ -314,6 +314,12 @@ static int pblk_core_init(struct pblk *pblk)
mempool_destroy(pblk->gen_ws_pool);
free_page_bio_pool:
mempool_destroy(pblk->page_bio_pool);
+free_global_caches:
+ kmem_cache_destroy(pblk_ws_cache);
+ kmem_cache_destroy(pblk_rec_cache);
+ kmem_cache_destroy(pblk_g_rq_cache);
+ kmem_cache_destroy(pblk_e_rq_cache);
+ kmem_cache_destroy(pblk_w_rq_cache);
return -ENOMEM;
}
--
2.7.4
Powered by blists - more mailing lists