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

Commit 26532ee5 authored by Javier González's avatar Javier González Committed by Jens Axboe
Browse files

lightnvm: pblk: use rqd->end_io for completion 



For consistency with the rest of pblk, use rqd->end_io to point to the
function taking care of ending the request 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 67bf26a3

drivers/lightnvm/pblk-core.c

+0 −7
Original line number Diff line number Diff line
@@ -261,13 +261,6 @@ void pblk_write_should_kick(struct pblk *pblk) 
		pblk_write_kick(pblk);

}



void pblk_end_bio_sync(struct bio *bio)

{

	struct completion *waiting = bio->bi_private;



	complete(waiting);

}



void pblk_end_io_sync(struct nvm_rq *rqd)

{

	struct completion *waiting = rqd->private;

drivers/lightnvm/pblk-read.c

+2 −3
Original line number Diff line number Diff line
@@ -170,13 +170,12 @@ static int pblk_fill_partial_read_bio(struct pblk *pblk, struct nvm_rq *rqd, 


	new_bio->bi_iter.bi_sector = 0; /* internal bio */

	bio_set_op_attrs(new_bio, REQ_OP_READ, 0);

	new_bio->bi_private = &wait;

	new_bio->bi_end_io = pblk_end_bio_sync;



	rqd->bio = new_bio;

	rqd->nr_ppas = nr_holes;

	rqd->flags = pblk_set_read_mode(pblk, PBLK_READ_RANDOM);

	rqd->end_io = NULL;

	rqd->end_io = pblk_end_io_sync;

	rqd->private = &wait;



	if (unlikely(nr_secs > 1 && nr_holes == 1)) {

		ppa_ptr = rqd->ppa_list;