iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme-lightnvm: use blk_execute_rq in nvme_nvm_submit_user_cmd

Browse Source 
Instead of reinventing it poorly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <Bart.VanAssche@sandisk.com>
Reviewed-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Christoph Hellwig 2017-06-03 09:37:54 +02:00 committed by Jens Axboe
parent dc88e34d69
commit 401741547f
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/nvme/host/lightnvm.c
View File

@ -571,13 +571,6 @@ static struct nvm_dev_ops nvme_nvm_dev_ops = {
.max_phys_sect = 64, .max_phys_sect = 64,
}; };
static void nvme_nvm_end_user_vio(struct request *rq, int error)
{
struct completion *waiting = rq->end_io_data;
complete(waiting);
}
static int nvme_nvm_submit_user_cmd(struct request_queue *q, static int nvme_nvm_submit_user_cmd(struct request_queue *q,
struct nvme_ns *ns, struct nvme_ns *ns,
struct nvme_nvm_command *vcmd, struct nvme_nvm_command *vcmd,
@ -608,7 +601,6 @@ static int nvme_nvm_submit_user_cmd(struct request_queue *q,
rq->timeout = timeout ? timeout : ADMIN_TIMEOUT; rq->timeout = timeout ? timeout : ADMIN_TIMEOUT;
rq->cmd_flags &= ~REQ_FAILFAST_DRIVER; rq->cmd_flags &= ~REQ_FAILFAST_DRIVER;
rq->end_io_data = &wait;
if (ppa_buf && ppa_len) { if (ppa_buf && ppa_len) {
ppa_list = dma_pool_alloc(dev->dma_pool, GFP_KERNEL, &ppa_dma); ppa_list = dma_pool_alloc(dev->dma_pool, GFP_KERNEL, &ppa_dma);
@ -662,9 +654,7 @@ static int nvme_nvm_submit_user_cmd(struct request_queue *q,
} }
submit: submit:
blk_execute_rq_nowait(q, NULL, rq, 0, nvme_nvm_end_user_vio); blk_execute_rq(q, NULL, rq, 0);
wait_for_completion_io(&wait);
if (nvme_req(rq)->flags & NVME_REQ_CANCELLED) if (nvme_req(rq)->flags & NVME_REQ_CANCELLED)
ret = -EINTR; ret = -EINTR;