From 9d11abfd0ee2518c39173ec88a031557e0ff7a54 Mon Sep 17 00:00:00 2001 From: Ziye Yang Date: Tue, 18 Dec 2018 02:40:31 +0800 Subject: [PATCH] nvmf: Do not set the error state of the qpair Reason: I checked the code in different transport, the qpair is already freed, so we dot need to set any state. Change-Id: I3d78c259c3f79ea4426dc9408e5c3469bc171358 Signed-off-by: Ziye Yang Reviewed-on: https://review.gerrithub.io/437493 Tested-by: SPDK CI Jenkins Chandler-Test-Pool: SPDK Automated Test System Reviewed-by: Ben Walker Reviewed-by: Changpeng Liu --- lib/nvmf/nvmf.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c index ac25e39cc..6b17c05da 100644 --- a/lib/nvmf/nvmf.c +++ b/lib/nvmf/nvmf.c @@ -654,8 +654,6 @@ spdk_nvmf_poll_group_add(struct spdk_nvmf_poll_group *group, qpair->group = group; spdk_nvmf_qpair_set_state(qpair, SPDK_NVMF_QPAIR_ACTIVATING); - TAILQ_INSERT_TAIL(&group->qpairs, qpair, link); - TAILQ_FOREACH(tgroup, &group->tgroups, link) { if (tgroup->transport == qpair->transport) { rc = spdk_nvmf_transport_poll_group_add(tgroup, qpair); @@ -663,10 +661,10 @@ spdk_nvmf_poll_group_add(struct spdk_nvmf_poll_group *group, } } + /* We add the qpair to the group only it is succesfully added into the tgroup */ if (rc == 0) { + TAILQ_INSERT_TAIL(&group->qpairs, qpair, link); spdk_nvmf_qpair_set_state(qpair, SPDK_NVMF_QPAIR_ACTIVE); - } else { - spdk_nvmf_qpair_set_state(qpair, SPDK_NVMF_QPAIR_ERROR); } return rc;