Commit c27278bd authored Jan 12, 2016 by Wenwei Tao Committed by Jens Axboe Jan 12, 2016

lightnvm: unlock rq and free ppa_list on submission fail



When rrpc_write_ppalist_rq and rrpc_read_ppalist_rq succeed, we setup
rq correctly, but nvm_submit_io may afterward fail since it cannot
allocate request or nvme_nvm_command, we return error but forget to
cleanup the previous work.

Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com>
Signed-off-by: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@fb.com>

parent 3bfbc6ad

drivers/lightnvm/rrpc.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -845,6 +845,12 @@ static int rrpc_submit_io(struct rrpc rrpc, struct bio bio,
		if (err) {
		pr_err("rrpc: I/O submission failed: %d\n", err);
		bio_put(bio);
		if (!(flags & NVM_IOTYPE_GC)) {
		rrpc_unlock_rq(rrpc, rqd);
		if (rqd->nr_pages > 1)
		nvm_dev_dma_free(rrpc->dev,
		rqd->ppa_list, rqd->dma_ppa_list);
		}
		return NVM_IO_ERR;
		}