Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55e836d4 authored by Javier González's avatar Javier González Committed by Jens Axboe
Browse files

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: default avatarJavier González <javier@cnexlabs.com>
Signed-off-by: default avatarMatias Bjørling <m@bjorling.me>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 2a19b10d

drivers/lightnvm/pblk-core.c

+7 −3
Original line number Diff line number Diff line
@@ -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 @@ static int pblk_line_submit_emeta_io(struct pblk *pblk, struct pblk_line *line, 
	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);

drivers/lightnvm/pblk-read.c

+0 −1
Original line number Diff line number Diff line
@@ -531,7 +531,6 @@ int pblk_submit_read_gc(struct pblk *pblk, struct pblk_gc_rq *gc_rq) 
	atomic_long_sub(gc_rq->secs_to_gc, &pblk->inflight_reads);

#endif



	bio_put(bio);

out:

	nvm_dev_dma_free(dev->parent, rqd.meta_list, rqd.dma_meta_list);

	return ret;

drivers/lightnvm/pblk-recovery.c

+0 −1
Original line number Diff line number Diff line
@@ -333,7 +333,6 @@ static void pblk_end_io_recov(struct nvm_rq *rqd) 


	pblk_up_page(pblk, rqd->ppa_list, rqd->nr_ppas);



	bio_put(rqd->bio);

	nvm_dev_dma_free(dev->parent, rqd->meta_list, rqd->dma_meta_list);

	pblk_free_rqd(pblk, rqd, WRITE);

drivers/lightnvm/pblk-write.c

+1 −7
Original line number Diff line number Diff line
@@ -188,17 +188,12 @@ static void pblk_end_io_write_meta(struct nvm_rq *rqd) 
		pblk_log_write_err(pblk, rqd);

		pr_err("pblk: metadata I/O failed. Line %d\n", line->id);

	}

#ifdef CONFIG_NVM_DEBUG

	else

		WARN_ONCE(rqd->bio->bi_status, "pblk: corrupted write error\n");

#endif



	sync = atomic_add_return(rqd->nr_ppas, &emeta->sync);

	if (sync == emeta->nr_entries)

		pblk_gen_run_ws(pblk, line, NULL, pblk_line_close_ws,

						GFP_ATOMIC, pblk->close_wq);



	bio_put(rqd->bio);

	nvm_dev_dma_free(dev->parent, rqd->meta_list, rqd->dma_meta_list);

	pblk_free_rqd(pblk, rqd, READ);
@@ -427,7 +422,6 @@ int pblk_submit_meta_io(struct pblk *pblk, struct pblk_line *meta_line) 


	nvm_dev_dma_free(dev->parent, rqd->meta_list, rqd->dma_meta_list);

fail_free_bio:

	if (likely(l_mg->emeta_alloc_type == PBLK_VMALLOC_META))

	bio_put(bio);

fail_free_rqd:

	pblk_free_rqd(pblk, rqd, READ);