lightnvm: pblk: encapsulate rqd dma allocations

dma allocations for ppa_list and meta_list in rqd are replicated in
several places across the pblk codebase. Make helpers to encapsulate
creation and deletion to simplify the code.

Signed-off-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <mb@lightnvm.io>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 2 insertions, 13 deletions

diff --git a/drivers/lightnvm/pblk-write.c b/drivers/lightnvm/pblk-write.c
index 9554febee480..a276f25d3931 100644
--- a/drivers/lightnvm/pblk-write.c
+++ b/drivers/lightnvm/pblk-write.c
@@ -285,11 +285,8 @@ static void pblk_end_io_write_meta(struct nvm_rq *rqd)
 }
 
 static int pblk_alloc_w_rq(struct pblk *pblk, struct nvm_rq *rqd,
-                           unsigned int nr_secs,
-                           nvm_end_io_fn(*end_io))
+                           unsigned int nr_secs, nvm_end_io_fn(*end_io))
 {
-        struct nvm_tgt_dev *dev = pblk->dev;
-
         /* Setup write request */
         rqd->opcode = NVM_OP_PWRITE;
         rqd->nr_ppas = nr_secs;
@@ -297,15 +294,7 @@ static int pblk_alloc_w_rq(struct pblk *pblk, struct nvm_rq *rqd,
         rqd->private = pblk;
         rqd->end_io = end_io;
 
-        rqd->meta_list = nvm_dev_dma_alloc(dev->parent, GFP_KERNEL,
-                                                        &rqd->dma_meta_list);
-        if (!rqd->meta_list)
-                return -ENOMEM;
-
-        rqd->ppa_list = rqd->meta_list + pblk_dma_meta_size;
-        rqd->dma_ppa_list = rqd->dma_meta_list + pblk_dma_meta_size;
-
-        return 0;
+        return pblk_alloc_rqd_meta(pblk, rqd);
 }
 
 static int pblk_setup_w_rq(struct pblk *pblk, struct nvm_rq *rqd,