ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvmf: do not dealloc tx_desc in RDMA error cases

Browse Source 
The connection will be closed in these cases anyway, so just let the
normal connection cleanup deal with the active tx_desc.

Change-Id: I96c68d5802e189bb82b180cc3c7d7c3f4135be1f
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-06-27 14:29:40 -07:00
parent 6419922466
commit 996705f1b8
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/nvmf/rdma.c
View File

@ -428,7 +428,6 @@ nvmf_post_rdma_send(struct spdk_nvmf_conn *conn,
int int
spdk_nvmf_rdma_request_complete(struct spdk_nvmf_conn *conn, struct spdk_nvmf_request *req) spdk_nvmf_rdma_request_complete(struct spdk_nvmf_conn *conn, struct spdk_nvmf_request *req)
{ {
struct nvme_qp_tx_desc *tx_desc = req->tx_desc;
struct spdk_nvme_cpl *rsp = &req->rsp->nvme_cpl; struct spdk_nvme_cpl *rsp = &req->rsp->nvme_cpl;
int ret; int ret;
@ -439,21 +438,17 @@ spdk_nvmf_rdma_request_complete(struct spdk_nvmf_conn *conn, struct spdk_nvmf_re
ret = nvmf_post_rdma_write(conn, req); ret = nvmf_post_rdma_write(conn, req);
if (ret) { if (ret) {
SPDK_ERRLOG("Unable to post rdma write tx descriptor\n"); SPDK_ERRLOG("Unable to post rdma write tx descriptor\n");
goto command_fail; return -1;
} }
} }
ret = nvmf_post_rdma_send(conn, req); ret = nvmf_post_rdma_send(conn, req);
if (ret) { if (ret) {
SPDK_ERRLOG("Unable to send response capsule\n"); SPDK_ERRLOG("Unable to send response capsule\n");
goto command_fail; return -1;
} }
return 0; return 0;
command_fail:
nvmf_deactive_tx_desc(tx_desc);
return -1;
} }
static int static int
@ -1245,7 +1240,6 @@ nvmf_check_rdma_completions(struct spdk_nvmf_conn *conn)
rc = spdk_nvmf_request_exec(req); rc = spdk_nvmf_request_exec(req);
if (rc) { if (rc) {
SPDK_ERRLOG("request_exec error %d after RDMA Read completion\n", rc); SPDK_ERRLOG("request_exec error %d after RDMA Read completion\n", rc);
nvmf_deactive_tx_desc(tx_desc);
return -1; return -1;
} }