From 529f7f3b8ee75d0af0c033df0de0a7c5b2dc8760 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Tue, 17 Jul 2018 15:57:25 -0700 Subject: [PATCH] Revert "nvmf: ensure that destroying qpairs have a state_cb" This reverts commit 238bc1de8082a20b11bd60a231cf03f34f1a4c60. Change-Id: If9041b33bb95582406518f73b601671fae11e984 Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/419731 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Chandler-Test-Pool: SPDK Automated Test System --- lib/nvmf/nvmf.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c index e00495a11..ece31ddb7 100644 --- a/lib/nvmf/nvmf.c +++ b/lib/nvmf/nvmf.c @@ -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); }