nvme-rdma: Simplify ib_post_(send|recv|srq_recv)() calls
Instead of declaring and passing a dummy 'bad_wr' pointer, pass NULL as third argument to ib_post_(send|recv|srq_recv)(). Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com> Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Reviewed-by: Max Gurtovoy <maxg@mellanox.com> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>hifive-unleashed-5.1
parent
9b32a59687
commit
45e3cc1a88
|
@ -1038,7 +1038,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,
|
static int nvme_rdma_inv_rkey(struct nvme_rdma_queue *queue,
|
||||||
struct nvme_rdma_request *req)
|
struct nvme_rdma_request *req)
|
||||||
{
|
{
|
||||||
struct ib_send_wr *bad_wr;
|
|
||||||
struct ib_send_wr wr = {
|
struct ib_send_wr wr = {
|
||||||
.opcode = IB_WR_LOCAL_INV,
|
.opcode = IB_WR_LOCAL_INV,
|
||||||
.next = NULL,
|
.next = NULL,
|
||||||
|
@ -1050,7 +1049,7 @@ static int nvme_rdma_inv_rkey(struct nvme_rdma_queue *queue,
|
||||||
req->reg_cqe.done = nvme_rdma_inv_rkey_done;
|
req->reg_cqe.done = nvme_rdma_inv_rkey_done;
|
||||||
wr.wr_cqe = &req->reg_cqe;
|
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,
|
static void nvme_rdma_unmap_data(struct nvme_rdma_queue *queue,
|
||||||
|
@ -1244,7 +1243,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 nvme_rdma_qe *qe, struct ib_sge *sge, u32 num_sge,
|
||||||
struct ib_send_wr *first)
|
struct ib_send_wr *first)
|
||||||
{
|
{
|
||||||
struct ib_send_wr wr, *bad_wr;
|
struct ib_send_wr wr;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
sge->addr = qe->dma;
|
sge->addr = qe->dma;
|
||||||
|
@ -1263,7 +1262,7 @@ static int nvme_rdma_post_send(struct nvme_rdma_queue *queue,
|
||||||
else
|
else
|
||||||
first = ≀
|
first = ≀
|
||||||
|
|
||||||
ret = ib_post_send(queue->qp, first, &bad_wr);
|
ret = ib_post_send(queue->qp, first, NULL);
|
||||||
if (unlikely(ret)) {
|
if (unlikely(ret)) {
|
||||||
dev_err(queue->ctrl->ctrl.device,
|
dev_err(queue->ctrl->ctrl.device,
|
||||||
"%s failed with error code %d\n", __func__, ret);
|
"%s failed with error code %d\n", __func__, ret);
|
||||||
|
@ -1274,7 +1273,7 @@ static int nvme_rdma_post_send(struct nvme_rdma_queue *queue,
|
||||||
static int nvme_rdma_post_recv(struct nvme_rdma_queue *queue,
|
static int nvme_rdma_post_recv(struct nvme_rdma_queue *queue,
|
||||||
struct nvme_rdma_qe *qe)
|
struct nvme_rdma_qe *qe)
|
||||||
{
|
{
|
||||||
struct ib_recv_wr wr, *bad_wr;
|
struct ib_recv_wr wr;
|
||||||
struct ib_sge list;
|
struct ib_sge list;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
@ -1289,7 +1288,7 @@ static int nvme_rdma_post_recv(struct nvme_rdma_queue *queue,
|
||||||
wr.sg_list = &list;
|
wr.sg_list = &list;
|
||||||
wr.num_sge = 1;
|
wr.num_sge = 1;
|
||||||
|
|
||||||
ret = ib_post_recv(queue->qp, &wr, &bad_wr);
|
ret = ib_post_recv(queue->qp, &wr, NULL);
|
||||||
if (unlikely(ret)) {
|
if (unlikely(ret)) {
|
||||||
dev_err(queue->ctrl->ctrl.device,
|
dev_err(queue->ctrl->ctrl.device,
|
||||||
"%s failed with error code %d\n", __func__, ret);
|
"%s failed with error code %d\n", __func__, ret);
|
||||||
|
|
Loading…
Reference in New Issue