lightnvm: pblk: put bio on bio completion

Simplify put bio by doing it on bio end_io instead of manually putting
it on the completion path.

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>

1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c
index 6dd4866e579c..3d27d24baa0b 100644
--- a/drivers/lightnvm/pblk-core.c
+++ b/drivers/lightnvm/pblk-core.c
@@ -417,6 +417,11 @@ int pblk_submit_io(struct pblk *pblk, struct nvm_rq *rqd)
         return nvm_submit_io(dev, rqd);
 }
 
+static void pblk_bio_map_addr_endio(struct bio *bio)
+{
+        bio_put(bio);
+}
+
 struct bio *pblk_bio_map_addr(struct pblk *pblk, void *data,
                               unsigned int nr_secs, unsigned int len,
                               int alloc_type, gfp_t gfp_mask)
@@ -453,6 +458,8 @@ struct bio *pblk_bio_map_addr(struct pblk *pblk, void *data,
 
                 kaddr += PAGE_SIZE;
         }
+
+        bio->bi_end_io = pblk_bio_map_addr_endio;
 out:
         return bio;
 }
@@ -671,9 +678,6 @@ next_rq:
         atomic_dec(&pblk->inflight_io);
         reinit_completion(&wait);
 
-        if (likely(pblk->l_mg.emeta_alloc_type == PBLK_VMALLOC_META))
-                bio_put(bio);
-
         if (rqd.error) {
                 if (dir == WRITE)
                         pblk_log_write_err(pblk, &rqd);