瀏覽代碼

lightnvm: pblk: free write buffer on init failure

Refactor the way we free the write buffer to ensure that all entries get
freed in case of an error on the init sequence.

Signed-off-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Javier González 7 年之前
父節點
當前提交
c6847e4e35
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      drivers/lightnvm/pblk-init.c

+ 2 - 1
drivers/lightnvm/pblk-init.c

@@ -355,6 +355,8 @@ 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);
 
 
+	pblk_rwb_free(pblk);
+
 	pblk_free_global_caches(pblk);
 	pblk_free_global_caches(pblk);
 }
 }
 
 
@@ -931,7 +933,6 @@ static void pblk_tear_down(struct pblk *pblk)
 	pblk_pipeline_stop(pblk);
 	pblk_pipeline_stop(pblk);
 	pblk_writer_stop(pblk);
 	pblk_writer_stop(pblk);
 	pblk_rb_sync_l2p(&pblk->rwb);
 	pblk_rb_sync_l2p(&pblk->rwb);
-	pblk_rwb_free(pblk);
 	pblk_rl_free(&pblk->rl);
 	pblk_rl_free(&pblk->rl);
 
 
 	pr_debug("pblk: consistent tear down\n");
 	pr_debug("pblk: consistent tear down\n");