diff mbox

[1/3] lightnvm: Proper error handling for pblk_bio_add_pages

Message ID 20180523122956.24137-2-igor.j.konopko@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Igor Konopko May 23, 2018, 12:29 p.m. UTC 
Currently in case of error caused by bio_pc_add_page in pblk_bio_add_pages
two issues occur when calling from pblk_rb_read_to_bio().
First one is in pblk_bio_free_pages, since we are trying to free
pages not allocated from our mempool. Second one is the warn from
dma_pool_free, that we are trying to free NULL pointer dma. 
This commit fix that both issues.

Signed-off-by: Igor Konopko <igor.j.konopko@intel.com>
Signed-off-by: Marcin Dziegielewski <marcin.dziegielewski@intel.com>
---
 drivers/lightnvm/pblk-core.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c
index e43093e27084..6d21f9dbca5f 100644
--- a/drivers/lightnvm/pblk-core.c
+++ b/drivers/lightnvm/pblk-core.c
@@ -278,7 +278,8 @@  void pblk_free_rqd(struct pblk *pblk, struct nvm_rq *rqd, int type)
 		return;
 	}
 
-	nvm_dev_dma_free(dev->parent, rqd->meta_list, rqd->dma_meta_list);
+	if (rqd->meta_list)
+		nvm_dev_dma_free(dev->parent, rqd->meta_list,
+				 rqd->dma_meta_list);
 	mempool_free(rqd, pool);
 }
 
@@ -316,7 +317,7 @@  int pblk_bio_add_pages(struct pblk *pblk, struct bio *bio, gfp_t flags,
 
 	return 0;
 err:
-	pblk_bio_free_pages(pblk, bio, 0, i - 1);
+	pblk_bio_free_pages(pblk, bio, (bio->bi_vcnt - i), i);
 	return -1;
 }