From ae207216fb1cf9ed85c63cd2d22f3ba1e5f3233c Mon Sep 17 00:00:00 2001 From: Jacek Kalwas Date: Sun, 13 Sep 2020 01:59:43 +0200 Subject: [PATCH] nvmf: remove request exec backdoor It was introduced for the purpose of executing fabric cmds when subsystem and qpairs are not active. It was rather workaround than solution for transport type like vfio-user. spdk_nvmf_request_exec is a preferred way of passing request obj into nvmf layer. Signed-off-by: Jacek Kalwas Change-Id: I4f989de27bfd494c744017599909c2e200f0f233 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4180 Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Changpeng Liu --- include/spdk/nvmf_transport.h | 1 - lib/nvmf/ctrlr.c | 18 ------------------ lib/nvmf/spdk_nvmf.map | 1 - 3 files changed, 20 deletions(-) diff --git a/include/spdk/nvmf_transport.h b/include/spdk/nvmf_transport.h index da2b9cdad..6660e37b2 100644 --- a/include/spdk/nvmf_transport.h +++ b/include/spdk/nvmf_transport.h @@ -410,7 +410,6 @@ int spdk_nvmf_request_get_buffers_multi(struct spdk_nvmf_request *req, bool spdk_nvmf_request_get_dif_ctx(struct spdk_nvmf_request *req, struct spdk_dif_ctx *dif_ctx); void spdk_nvmf_request_exec(struct spdk_nvmf_request *req); -void spdk_nvmf_request_exec_fabrics(struct spdk_nvmf_request *req); int spdk_nvmf_request_free(struct spdk_nvmf_request *req); int spdk_nvmf_request_complete(struct spdk_nvmf_request *req); diff --git a/lib/nvmf/ctrlr.c b/lib/nvmf/ctrlr.c index d0bbe2464..d3c4155be 100644 --- a/lib/nvmf/ctrlr.c +++ b/lib/nvmf/ctrlr.c @@ -3335,24 +3335,6 @@ _nvmf_request_exec(struct spdk_nvmf_request *req, } } -void -spdk_nvmf_request_exec_fabrics(struct spdk_nvmf_request *req) -{ - struct spdk_nvmf_qpair *qpair = req->qpair; - struct spdk_nvmf_subsystem_poll_group *sgroup = NULL; - - assert(req->cmd->nvmf_cmd.opcode == SPDK_NVME_OPC_FABRIC); - - if (qpair->ctrlr) { - sgroup = &qpair->group->sgroups[qpair->ctrlr->subsys->id]; - assert(sgroup != NULL); - } else { - sgroup = nvmf_subsystem_pg_from_connect_cmd(req); - } - - _nvmf_request_exec(req, sgroup); -} - void spdk_nvmf_request_exec(struct spdk_nvmf_request *req) { diff --git a/lib/nvmf/spdk_nvmf.map b/lib/nvmf/spdk_nvmf.map index 261c03960..c6b9e601f 100644 --- a/lib/nvmf/spdk_nvmf.map +++ b/lib/nvmf/spdk_nvmf.map @@ -107,7 +107,6 @@ spdk_nvmf_request_get_buffers_multi; spdk_nvmf_request_get_dif_ctx; spdk_nvmf_request_exec; - spdk_nvmf_request_exec_fabrics; spdk_nvmf_request_free; spdk_nvmf_request_complete; spdk_nvmf_ctrlr_get_subsystem;