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

Commit 06894efe authored by Matias Bjørling's avatar Matias Bjørling Committed by Jens Axboe
Browse files

lightnvm: use end_io callback instead of instance 



When the lightnvm core had the "gennvm" layer between the device and the
target, there was a need for the core to be able to figure out which
target it should send an end_io callback to. Leading to a "double"
end_io, first for the media manager instance, and then for the target
instance. Now that core and gennvm is merged, there is no longer a need
for this, and a single end_io callback will do.

Signed-off-by: default avatarMatias Bjørling <matias@cnexlabs.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 84d4add7

drivers/block/null_blk.c

+2 −1
Original line number Diff line number Diff line
@@ -420,7 +420,8 @@ static void null_lnvm_end_io(struct request *rq, int error) 
{

	struct nvm_rq *rqd = rq->end_io_data;



	nvm_end_io(rqd, error);

	rqd->error = error;

	nvm_end_io(rqd);



	blk_put_request(rq);

}

drivers/lightnvm/core.c

+3 −4
Original line number Diff line number Diff line
@@ -773,17 +773,16 @@ void nvm_free_rqd_ppalist(struct nvm_dev *dev, struct nvm_rq *rqd) 
}

EXPORT_SYMBOL(nvm_free_rqd_ppalist);



void nvm_end_io(struct nvm_rq *rqd, int error)

void nvm_end_io(struct nvm_rq *rqd)

{

	struct nvm_tgt_dev *tgt_dev = rqd->dev;

	struct nvm_tgt_instance *ins = rqd->ins;



	/* Convert address space */

	if (tgt_dev)

		nvm_rq_dev_to_tgt(tgt_dev, rqd);



	rqd->error = error;

	ins->tt->end_io(rqd);

	if (rqd->end_io)

		rqd->end_io(rqd);

}

EXPORT_SYMBOL(nvm_end_io);

drivers/lightnvm/rrpc.c

+3 −4
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ static void rrpc_end_io_write(struct rrpc *rrpc, struct rrpc_rq *rrqd, 


static void rrpc_end_io(struct nvm_rq *rqd)

{

	struct rrpc *rrpc = container_of(rqd->ins, struct rrpc, instance);

	struct rrpc *rrpc = rqd->private;

	struct nvm_tgt_dev *dev = rrpc->dev;

	struct rrpc_rq *rrqd = nvm_rq_to_pdu(rqd);

	uint8_t npages = rqd->nr_ppas;
@@ -972,8 +972,9 @@ static int rrpc_submit_io(struct rrpc *rrpc, struct bio *bio, 


	bio_get(bio);

	rqd->bio = bio;

	rqd->ins = &rrpc->instance;

	rqd->private = rrpc;

	rqd->nr_ppas = nr_pages;

	rqd->end_io = rrpc_end_io;

	rrq->flags = flags;



	err = nvm_submit_io(dev, rqd);
@@ -1532,7 +1533,6 @@ static void *rrpc_init(struct nvm_tgt_dev *dev, struct gendisk *tdisk) 
	if (!rrpc)

		return ERR_PTR(-ENOMEM);



	rrpc->instance.tt = &tt_rrpc;

	rrpc->dev = dev;

	rrpc->disk = tdisk;
@@ -1611,7 +1611,6 @@ static struct nvm_tgt_type tt_rrpc = { 


	.make_rq	= rrpc_make_rq,

	.capacity	= rrpc_capacity,

	.end_io		= rrpc_end_io,



	.init		= rrpc_init,

	.exit		= rrpc_exit,

drivers/lightnvm/rrpc.h

+0 −3
Original line number Diff line number Diff line
@@ -102,9 +102,6 @@ struct rrpc_lun { 
};



struct rrpc {

	/* instance must be kept in top to resolve rrpc in unprep */

	struct nvm_tgt_instance instance;



	struct nvm_tgt_dev *dev;

	struct gendisk *disk;

drivers/nvme/host/lightnvm.c

+2 −1
Original line number Diff line number Diff line
@@ -484,7 +484,8 @@ static void nvme_nvm_end_io(struct request *rq, int error) 
	struct nvm_rq *rqd = rq->end_io_data;



	rqd->ppa_status = nvme_req(rq)->result.u64;

	nvm_end_io(rqd, error);

	rqd->error = error;

	nvm_end_io(rqd);



	kfree(nvme_req(rq)->cmd);

	blk_mq_free_request(rq);