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

nvmf: simplify nvmf_check_rdma_completions()

Browse Source 
The error case could only be reached with tx_desc != NULL in one case,
so move the cleanup code there and drop the goto.

Change-Id: I7aace6b40dd75ef8d86fb173f9d58110e929b082
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-06-27 13:09:54 -07:00
parent cef7ad58ec
commit 558347432f
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/nvmf/rdma.c
View File

@ -1201,8 +1201,6 @@ nvmf_check_rdma_completions(struct spdk_nvmf_conn *conn)
int i; int i;
for (i = 0; i < conn->rdma.sq_depth; i++) { for (i = 0; i < conn->rdma.sq_depth; i++) {
tx_desc = NULL;
rc = ibv_poll_cq(conn->rdma.cq, 1, &wc); rc = ibv_poll_cq(conn->rdma.cq, 1, &wc);
if (rc == 0) // No completions at this time if (rc == 0) // No completions at this time
break; break;
@ -1210,7 +1208,7 @@ nvmf_check_rdma_completions(struct spdk_nvmf_conn *conn)
if (rc < 0) { if (rc < 0) {
SPDK_ERRLOG("Poll CQ error!(%d): %s\n", SPDK_ERRLOG("Poll CQ error!(%d): %s\n",
errno, strerror(errno)); errno, strerror(errno));
goto handler_error; return -1;
} }
/* OK, process the single successful cq event */ /* OK, process the single successful cq event */
@ -1248,12 +1246,14 @@ 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);
goto handler_error; nvmf_deactive_tx_desc(tx_desc);
return -1;
} }
rc = nvmf_process_pending_rdma(conn); rc = nvmf_process_pending_rdma(conn);
if (rc) { if (rc) {
goto handler_error; SPDK_ERRLOG("nvmf_process_pending_rdma() failed: %d\n", rc);
return -1;
} }
break; break;
@ -1263,22 +1263,16 @@ nvmf_check_rdma_completions(struct spdk_nvmf_conn *conn)
rc = nvmf_recv(conn, &wc); rc = nvmf_recv(conn, &wc);
if (rc) { if (rc) {
SPDK_ERRLOG("nvmf_recv processing failure\n"); SPDK_ERRLOG("nvmf_recv processing failure\n");
goto handler_error; return -1;
} }
break; break;
default: default:
SPDK_ERRLOG("Poll cq opcode type unknown!!!!! completion\n"); SPDK_ERRLOG("Poll cq opcode type unknown!!!!! completion\n");
goto handler_error; return -1;
} }
} }
return cq_count; return cq_count;
handler_error:
if (tx_desc != NULL)
nvmf_deactive_tx_desc(tx_desc);
SPDK_ERRLOG("handler error, exiting!\n");
return -1;
} }
SPDK_LOG_REGISTER_TRACE_FLAG("rdma", SPDK_TRACE_RDMA) SPDK_LOG_REGISTER_TRACE_FLAG("rdma", SPDK_TRACE_RDMA)