From a6704e454c1a42d56913e57c5b4aa0019e99cdd2 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Thu, 30 Jun 2022 22:59:44 +0000 Subject: [PATCH] nvme: put rdma req in nvme_rdma_req_complete All of the callers immediately put the req right after the nvme_rdma_req_complete call, so just move the put into that function instead. Signed-off-by: Jim Harris Change-Id: Ic370cf689850924e0c902a6071af8b3a7ed58c0b Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13527 Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Shuhei Matsumoto Community-CI: Broadcom CI --- lib/nvme/nvme_rdma.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/nvme/nvme_rdma.c b/lib/nvme/nvme_rdma.c index 5fe1cdfb2..49b9de72b 100644 --- a/lib/nvme/nvme_rdma.c +++ b/lib/nvme/nvme_rdma.c @@ -460,6 +460,7 @@ nvme_rdma_req_complete(struct spdk_nvme_rdma_req *rdma_req, nvme_complete_request(req->cb_fn, req->cb_arg, qpair, req, rsp); nvme_free_request(req); + nvme_rdma_req_put(rqpair, rdma_req); } static const char * @@ -2413,7 +2414,6 @@ nvme_rdma_qpair_abort_reqs(struct spdk_nvme_qpair *qpair, uint32_t dnr) TAILQ_FOREACH_SAFE(rdma_req, &rqpair->outstanding_reqs, link, tmp) { nvme_rdma_req_complete(rdma_req, &cpl, true); - nvme_rdma_req_put(rqpair, rdma_req); } } @@ -2460,7 +2460,6 @@ static inline int nvme_rdma_request_ready(struct nvme_rdma_qpair *rqpair, struct spdk_nvme_rdma_req *rdma_req) { nvme_rdma_req_complete(rdma_req, &rqpair->rsps[rdma_req->rsp_idx].cpl, true); - nvme_rdma_req_put(rqpair, rdma_req); return nvme_rdma_post_recv(rqpair, rdma_req->rsp_idx); } @@ -2814,7 +2813,6 @@ nvme_rdma_admin_qpair_abort_aers(struct spdk_nvme_qpair *qpair) } nvme_rdma_req_complete(rdma_req, &cpl, false); - nvme_rdma_req_put(rqpair, rdma_req); } }