From b9fe38c1b9aedef57cab363c127615dd9d2e7324 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Thu, 9 May 2019 12:16:48 -0700 Subject: [PATCH] nvme: reuse err_req_head completion code in nvme_qpair_deinit Signed-off-by: Jim Harris Change-Id: I563165ce103fe5f72885adb0486bcb05bc2817e0 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/453931 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Shuhei Matsumoto Reviewed-by: Changpeng Liu --- lib/nvme/nvme_qpair.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/nvme/nvme_qpair.c b/lib/nvme/nvme_qpair.c index dabfe833a..90a65d3c8 100644 --- a/lib/nvme/nvme_qpair.c +++ b/lib/nvme/nvme_qpair.c @@ -517,16 +517,9 @@ nvme_qpair_complete_error_reqs(struct spdk_nvme_qpair *qpair) void nvme_qpair_deinit(struct spdk_nvme_qpair *qpair) { - struct nvme_request *req; struct nvme_error_cmd *cmd, *entry; - while (!STAILQ_EMPTY(&qpair->err_req_head)) { - req = STAILQ_FIRST(&qpair->err_req_head); - STAILQ_REMOVE_HEAD(&qpair->err_req_head, stailq); - nvme_qpair_manual_complete_request(qpair, req, - req->cpl.status.sct, - req->cpl.status.sc, 0, true); - } + nvme_qpair_complete_error_reqs(qpair); TAILQ_FOREACH_SAFE(cmd, &qpair->err_cmd_head, link, entry) { TAILQ_REMOVE(&qpair->err_cmd_head, cmd, link);