Commit 2e13f33a authored May 03, 2017 by Javier González Committed by Jens Axboe May 04, 2017

lightnvm: create cmd before allocating request



Create nvme command before allocating a request using
nvme_alloc_request, which uses the command direction. Up until now, the
command has been zeroized, so all commands have been allocated as a
read operation.

Signed-off-by: Javier González <javier@cnexlabs.com>
Reviewed-by: Matias Bjørling <matias@cnexlabs.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>

parent 2719aa21

drivers/nvme/host/lightnvm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -503,6 +503,8 @@ static int nvme_nvm_submit_io(struct nvm_dev dev, struct nvm_rq rqd)
		if (!cmd)
		return -ENOMEM;

		nvme_nvm_rqtocmd(rq, rqd, ns, cmd);

		rq = nvme_alloc_request(q, (struct nvme_command *)cmd, 0, NVME_QID_ANY);
		if (IS_ERR(rq)) {
		kfree(cmd);
		@@ -517,8 +519,6 @@ static int nvme_nvm_submit_io(struct nvm_dev dev, struct nvm_rq rqd)
		rq->__data_len = 0;
		}

		nvme_nvm_rqtocmd(rq, rqd, ns, cmd);

		rq->end_io_data = rqd;

		blk_execute_rq_nowait(q, NULL, rq, 0, nvme_nvm_end_io);