Merge tag 'for-5.13/drivers-2021-04-27' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / nvme / host / rdma.c

diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index be905d4..660c774 100644 (file)
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -314,6 +314,7 @@ static int nvme_rdma_init_request(struct blk_mq_tag_set *set,
                        NVME_RDMA_DATA_SGL_SIZE;
 
        req->queue = queue;
+       nvme_req(rq)->cmd = req->sqe.data;
 
        return 0;
 }
@@ -920,7 +921,7 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl,
 
        blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);
 
-       error = nvme_init_identify(&ctrl->ctrl);
+       error = nvme_init_ctrl_finish(&ctrl->ctrl);
        if (error)
                goto out_quiesce_queue;
 
@@ -2041,7 +2042,7 @@ static blk_status_t nvme_rdma_queue_rq(struct blk_mq_hw_ctx *hctx,
        struct request *rq = bd->rq;
        struct nvme_rdma_request *req = blk_mq_rq_to_pdu(rq);
        struct nvme_rdma_qe *sqe = &req->sqe;
-       struct nvme_command *c = sqe->data;
+       struct nvme_command *c = nvme_req(rq)->cmd;
        struct ib_device *dev;
        bool queue_ready = test_bit(NVME_RDMA_Q_LIVE, &queue->flags);
        blk_status_t ret;
@@ -2064,7 +2065,7 @@ static blk_status_t nvme_rdma_queue_rq(struct blk_mq_hw_ctx *hctx,
        ib_dma_sync_single_for_cpu(dev, sqe->dma,
                        sizeof(struct nvme_command), DMA_TO_DEVICE);
 
-       ret = nvme_setup_cmd(ns, rq, c);
+       ret = nvme_setup_cmd(ns, rq);
        if (ret)
                goto unmap_qe;