From b906bbb6997785d9ea0bd3f5585537afa6257c43 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sun, 20 May 2018 18:25:50 -0400 Subject: lightnvm: convert to bioset_init()/mempool_init() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Convert lightnvm to embedded bio sets. Reviewed-by: Javier González Signed-off-by: Kent Overstreet Signed-off-by: Jens Axboe --- drivers/lightnvm/pblk-write.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/lightnvm/pblk-write.c') diff --git a/drivers/lightnvm/pblk-write.c b/drivers/lightnvm/pblk-write.c index 3e6f1ebd743a..aef7fa2d401d 100644 --- a/drivers/lightnvm/pblk-write.c +++ b/drivers/lightnvm/pblk-write.c @@ -122,7 +122,7 @@ static void pblk_end_w_fail(struct pblk *pblk, struct nvm_rq *rqd) if (unlikely(nr_ppas == 1)) ppa_list = &rqd->ppa_addr; - recovery = mempool_alloc(pblk->rec_pool, GFP_ATOMIC); + recovery = mempool_alloc(&pblk->rec_pool, GFP_ATOMIC); INIT_LIST_HEAD(&recovery->failed); @@ -134,7 +134,7 @@ static void pblk_end_w_fail(struct pblk *pblk, struct nvm_rq *rqd) /* Logic error */ if (bit > c_ctx->nr_valid) { WARN_ONCE(1, "pblk: corrupted write request\n"); - mempool_free(recovery, pblk->rec_pool); + mempool_free(recovery, &pblk->rec_pool); goto out; } @@ -142,7 +142,7 @@ static void pblk_end_w_fail(struct pblk *pblk, struct nvm_rq *rqd) entry = pblk_rb_sync_scan_entry(&pblk->rwb, &ppa); if (!entry) { pr_err("pblk: could not scan entry on write failure\n"); - mempool_free(recovery, pblk->rec_pool); + mempool_free(recovery, &pblk->rec_pool); goto out; } @@ -156,7 +156,7 @@ static void pblk_end_w_fail(struct pblk *pblk, struct nvm_rq *rqd) ret = pblk_recov_setup_rq(pblk, c_ctx, recovery, comp_bits, c_entries); if (ret) { pr_err("pblk: could not recover from write failure\n"); - mempool_free(recovery, pblk->rec_pool); + mempool_free(recovery, &pblk->rec_pool); goto out; } -- cgit v1.2.3