lightnvm: pblk: remove unnecessary checks
authorJavier González <jg@lightnvm.io>
Fri, 7 Jul 2017 19:08:53 +0000 (21:08 +0200)
committerJens Axboe <axboe@kernel.dk>
Fri, 7 Jul 2017 19:17:36 +0000 (13:17 -0600)
Remove unnecessary checks when freeing dma memory in the completion
path.

Signed-off-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <matias@cnexlabs.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/lightnvm/pblk-write.c

index cc2b941..3ad9e56 100644 (file)
@@ -39,9 +39,7 @@ static unsigned long pblk_end_w_bio(struct pblk *pblk, struct nvm_rq *rqd,
 
        ret = pblk_rb_sync_advance(&pblk->rwb, c_ctx->nr_valid);
 
-       if (rqd->meta_list)
-               nvm_dev_dma_free(dev->parent, rqd->meta_list,
-                                                       rqd->dma_meta_list);
+       nvm_dev_dma_free(dev->parent, rqd->meta_list, rqd->dma_meta_list);
 
        bio_put(rqd->bio);
        pblk_free_rqd(pblk, rqd, WRITE);
@@ -224,9 +222,6 @@ static int pblk_alloc_w_rq(struct pblk *pblk, struct nvm_rq *rqd,
        if (!rqd->meta_list)
                return -ENOMEM;
 
-       if (unlikely(nr_secs == 1))
-               return 0;
-
        rqd->ppa_list = rqd->meta_list + pblk_dma_meta_size;
        rqd->dma_ppa_list = rqd->dma_meta_list + pblk_dma_meta_size;