From 6696fce7ae927a3297ec7125186eee074636be2b Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Wed, 15 Mar 2017 13:58:16 -0700 Subject: [PATCH] nvmf/rdma: Manually inline nvmf_post_rdma_send This call had been reduced to a simple wrapper around the ibv call. Delete it. Change-Id: I42926d123db262617119a9cff77bc0d0eb1e8f31 Signed-off-by: Ben Walker --- lib/nvmf/rdma.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c index 221d2242c..63ef60e00 100644 --- a/lib/nvmf/rdma.c +++ b/lib/nvmf/rdma.c @@ -420,26 +420,6 @@ spdk_nvmf_rdma_conn_create(struct rdma_cm_id *id, struct ibv_comp_channel *chann return rdma_conn; } -static int -nvmf_post_rdma_send(struct spdk_nvmf_request *req) -{ - struct ibv_send_wr *bad_wr = NULL; - struct spdk_nvmf_conn *conn = req->conn; - struct spdk_nvmf_rdma_request *rdma_req = get_rdma_req(req); - struct spdk_nvmf_rdma_conn *rdma_conn = get_rdma_conn(conn); - int rc; - - SPDK_TRACELOG(SPDK_TRACE_RDMA, "RDMA SEND POSTED. Request: %p Connection: %p\n", req, conn); - - spdk_trace_record(TRACE_NVMF_IO_COMPLETE, 0, 0, (uintptr_t)req, 0); - rc = ibv_post_send(rdma_conn->cm_id->qp, &rdma_req->rsp.wr, &bad_wr); - if (rc) { - SPDK_ERRLOG("Failure posting rdma send for NVMf completion, rc = 0x%x\n", rc); - } - - return rc; -} - static int request_transfer_in(struct spdk_nvmf_request *req) { @@ -516,7 +496,9 @@ request_transfer_out(struct spdk_nvmf_request *req) } /* Send the completion */ - rc = nvmf_post_rdma_send(req); + SPDK_TRACELOG(SPDK_TRACE_RDMA, "RDMA SEND POSTED. Request: %p Connection: %p\n", req, conn); + spdk_trace_record(TRACE_NVMF_IO_COMPLETE, 0, 0, (uintptr_t)req, 0); + rc = ibv_post_send(rdma_conn->cm_id->qp, &rdma_req->rsp.wr, &bad_send_wr); if (rc) { SPDK_ERRLOG("Unable to send response capsule\n"); }