aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/lightnvm/pblk-write.c
diff options
context:
space:
mode:
authorJavier González <jg@lightnvm.io>2017-07-07 15:08:53 -0400
committerJens Axboe <axboe@kernel.dk>2017-07-07 15:17:36 -0400
commit56c76417ad310a060252a13f88001c35b73d241d (patch)
tree232b19910247ed301d8ebe74c7d9d08065e78383 /drivers/lightnvm/pblk-write.c
parent3eaa11e2780dc38350c133bd998cac1df488d040 (diff)
lightnvm: pblk: remove unnecessary checks
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>
Diffstat (limited to 'drivers/lightnvm/pblk-write.c')
-rw-r--r--drivers/lightnvm/pblk-write.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/lightnvm/pblk-write.c b/drivers/lightnvm/pblk-write.c
index cc2b9414d17c..3ad9e56d2473 100644
--- a/drivers/lightnvm/pblk-write.c
+++ b/drivers/lightnvm/pblk-write.c
@@ -39,9 +39,7 @@ static unsigned long pblk_end_w_bio(struct pblk *pblk, struct nvm_rq *rqd,
39 39
40 ret = pblk_rb_sync_advance(&pblk->rwb, c_ctx->nr_valid); 40 ret = pblk_rb_sync_advance(&pblk->rwb, c_ctx->nr_valid);
41 41
42 if (rqd->meta_list) 42 nvm_dev_dma_free(dev->parent, rqd->meta_list, rqd->dma_meta_list);
43 nvm_dev_dma_free(dev->parent, rqd->meta_list,
44 rqd->dma_meta_list);
45 43
46 bio_put(rqd->bio); 44 bio_put(rqd->bio);
47 pblk_free_rqd(pblk, rqd, WRITE); 45 pblk_free_rqd(pblk, rqd, WRITE);
@@ -224,9 +222,6 @@ static int pblk_alloc_w_rq(struct pblk *pblk, struct nvm_rq *rqd,
224 if (!rqd->meta_list) 222 if (!rqd->meta_list)
225 return -ENOMEM; 223 return -ENOMEM;
226 224
227 if (unlikely(nr_secs == 1))
228 return 0;
229
230 rqd->ppa_list = rqd->meta_list + pblk_dma_meta_size; 225 rqd->ppa_list = rqd->meta_list + pblk_dma_meta_size;
231 rqd->dma_ppa_list = rqd->dma_meta_list + pblk_dma_meta_size; 226 rqd->dma_ppa_list = rqd->dma_meta_list + pblk_dma_meta_size;
232 227