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 <james.r.harris@intel.com> Change-Id: Ic370cf689850924e0c902a6071af8b3a7ed58c0b Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13527 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Changpeng Liu <changpeng.liu@intel.com> Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com> Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
This commit is contained in:
parent
e415bf0033
commit
a6704e454c
@ -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_complete_request(req->cb_fn, req->cb_arg, qpair, req, rsp);
|
||||||
nvme_free_request(req);
|
nvme_free_request(req);
|
||||||
|
nvme_rdma_req_put(rqpair, rdma_req);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *
|
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) {
|
TAILQ_FOREACH_SAFE(rdma_req, &rqpair->outstanding_reqs, link, tmp) {
|
||||||
nvme_rdma_req_complete(rdma_req, &cpl, true);
|
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_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_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);
|
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_complete(rdma_req, &cpl, false);
|
||||||
nvme_rdma_req_put(rqpair, rdma_req);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user