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

Revert "nvmf: ensure that destroying qpairs have a state_cb"

Browse Source 
This reverts commit 238bc1de8082a20b11bd60a231cf03f34f1a4c60.

Change-Id: If9041b33bb95582406518f73b601671fae11e984
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/419731
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Seth Howell 2018-07-17 15:57:25 -07:00 committed by Ben Walker
parent 4bfb557d80
commit 529f7f3b8e
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/nvmf/nvmf.c
View File

@ -669,17 +669,6 @@ _spdk_nvmf_qpair_deactivate(void *ctx)
struct nvmf_qpair_disconnect_ctx *qpair_ctx = ctx;
struct spdk_nvmf_qpair *qpair = qpair_ctx->qpair;
/* Check for outstanding I/O */
if (!TAILQ_EMPTY(&qpair->outstanding)) {
if (qpair->state_cb != NULL) {
qpair->state_cb = _spdk_nvmf_qpair_destroy;
qpair->state_cb_arg = qpair_ctx;
} else {
free(qpair_ctx);
}
return;
}
if (qpair->state == SPDK_NVMF_QPAIR_DEACTIVATING ||
qpair->state == SPDK_NVMF_QPAIR_INACTIVE) {
/* This can occur if the connection is killed by the target,
@ -695,6 +684,13 @@ _spdk_nvmf_qpair_deactivate(void *ctx)
assert(qpair->state == SPDK_NVMF_QPAIR_ACTIVE);
qpair->state = SPDK_NVMF_QPAIR_DEACTIVATING;
/* Check for outstanding I/O */
if (!TAILQ_EMPTY(&qpair->outstanding)) {
qpair->state_cb = _spdk_nvmf_qpair_destroy;
qpair->state_cb_arg = qpair_ctx;
return;
}
_spdk_nvmf_qpair_destroy(qpair_ctx, 0);
}