Merge tag 'v4.18' into rdma.git for-next

[platform/kernel/linux-rpi.git] / drivers / nvme / host / rdma.c

diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 66ec598..72e8e8e 100644 (file)
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -1040,7 +1040,6 @@ static void nvme_rdma_inv_rkey_done(struct ib_cq *cq, struct ib_wc *wc)
 static int nvme_rdma_inv_rkey(struct nvme_rdma_queue *queue,
                struct nvme_rdma_request *req)
 {
-       struct ib_send_wr *bad_wr;
        struct ib_send_wr wr = {
                .opcode             = IB_WR_LOCAL_INV,
                .next               = NULL,
@@ -1052,7 +1051,7 @@ static int nvme_rdma_inv_rkey(struct nvme_rdma_queue *queue,
        req->reg_cqe.done = nvme_rdma_inv_rkey_done;
        wr.wr_cqe = &req->reg_cqe;
 
-       return ib_post_send(queue->qp, &wr, &bad_wr);
+       return ib_post_send(queue->qp, &wr, NULL);
 }
 
 static void nvme_rdma_unmap_data(struct nvme_rdma_queue *queue,
@@ -1246,7 +1245,7 @@ static int nvme_rdma_post_send(struct nvme_rdma_queue *queue,
                struct nvme_rdma_qe *qe, struct ib_sge *sge, u32 num_sge,
                struct ib_send_wr *first)
 {
-       struct ib_send_wr wr, *bad_wr;
+       struct ib_send_wr wr;
        int ret;
 
        sge->addr   = qe->dma;
@@ -1265,7 +1264,7 @@ static int nvme_rdma_post_send(struct nvme_rdma_queue *queue,
        else
                first = ≀
 
-       ret = ib_post_send(queue->qp, first, &bad_wr);
+       ret = ib_post_send(queue->qp, first, NULL);
        if (unlikely(ret)) {
                dev_err(queue->ctrl->ctrl.device,
                             "%s failed with error code %d\n", __func__, ret);
@@ -1276,7 +1275,7 @@ static int nvme_rdma_post_send(struct nvme_rdma_queue *queue,
 static int nvme_rdma_post_recv(struct nvme_rdma_queue *queue,
                struct nvme_rdma_qe *qe)
 {
-       struct ib_recv_wr wr, *bad_wr;
+       struct ib_recv_wr wr;
        struct ib_sge list;
        int ret;
 
@@ -1291,7 +1290,7 @@ static int nvme_rdma_post_recv(struct nvme_rdma_queue *queue,
        wr.sg_list  = &list;
        wr.num_sge  = 1;
 
-       ret = ib_post_recv(queue->qp, &wr, &bad_wr);
+       ret = ib_post_recv(queue->qp, &wr, NULL);
        if (unlikely(ret)) {
                dev_err(queue->ctrl->ctrl.device,
                        "%s failed with error code %d\n", __func__, ret);