nvme: remove nvme_alloc_request and nvme_alloc_request_qid

[uclinux-h8/linux.git] / drivers / nvme / target / passthru.c

diff --git a/drivers/nvme/target/passthru.c b/drivers/nvme/target/passthru.c
index a810bf5..a4de1e0 100644 (file)
--- a/drivers/nvme/target/passthru.c
+++ b/drivers/nvme/target/passthru.c
@@ -254,11 +254,12 @@ static void nvmet_passthru_execute_cmd(struct nvmet_req *req)
                timeout = nvmet_req_subsys(req)->admin_timeout;
        }
 
-       rq = nvme_alloc_request(q, req->cmd, 0);
+       rq = blk_mq_alloc_request(q, nvme_req_op(req->cmd), 0);
        if (IS_ERR(rq)) {
                status = NVME_SC_INTERNAL;
                goto out_put_ns;
        }
+       nvme_init_request(rq, req->cmd);
 
        if (timeout)
                rq->timeout = timeout;