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

nvmf: Fix search for request to abort

Browse Source 
Transport specific request to abort is never null,
if we don't find a request by cid then we will abort the
last request.

Change-Id: Ie9eb55822b47381ae254e19266b9f3ffadbb67ea
Signed-off-by: Alexey Marchuk <alexeymar@mellanox.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5196
Community-CI: Broadcom CI
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ziye Yang <ziye.yang@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Alexey Marchuk 2020-11-23 11:03:12 +03:00 committed by Tomasz Zawadzki
parent 959cfa0fd5
commit 0bee1bb67b
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/nvmf/rdma.c
View File

@ -4240,10 +4240,9 @@ nvmf_rdma_qpair_abort_request(struct spdk_nvmf_qpair *qpair,
cid = req->cmd->nvme_cmd.cdw10_bits.abort.cid;
for (i = 0; i < rqpair->max_queue_depth; i++) {
rdma_req_to_abort = &rqpair->resources->reqs[i];
if (rdma_req_to_abort->state != RDMA_REQUEST_STATE_FREE &&
rdma_req_to_abort->req.cmd->nvme_cmd.cid == cid) {
if (rqpair->resources->reqs[i].state != RDMA_REQUEST_STATE_FREE &&
rqpair->resources->reqs[i].req.cmd->nvme_cmd.cid == cid) {
rdma_req_to_abort = &rqpair->resources->reqs[i];
break;
}
}

7
lib/nvmf/tcp.c
View File

@ -2717,10 +2717,9 @@ nvmf_tcp_qpair_abort_request(struct spdk_nvmf_qpair *qpair,
cid = req->cmd->nvme_cmd.cdw10_bits.abort.cid;
for (i = 0; i < tqpair->resource_count; i++) {
tcp_req_to_abort = &tqpair->reqs[i];
if (tcp_req_to_abort->state != TCP_REQUEST_STATE_FREE &&
tcp_req_to_abort->req.cmd->nvme_cmd.cid == cid) {
if (tqpair->reqs[i].state != TCP_REQUEST_STATE_FREE &&
tqpair->reqs[i].req.cmd->nvme_cmd.cid == cid) {
tcp_req_to_abort = &tqpair->reqs[i];
break;
}
}