From 8c3b9204b182b6ba1a9db7cc3b70e55a57192695 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Wed, 16 Dec 2020 13:57:26 +0000 Subject: [PATCH] Revert "lib/nvmf: Add trid to struct spdk_nvmf_qpair" This reverts commit e21de9a9ccaf6efdd151c01aabdcda426107bb88. Reason for revert: The public API spdk_nvmf_qpair_get_listen_trid() was overlooked when this patch is created. Then the code to use the trid was replaced by spdk_nvmf_qpair_get_listen_trid(). To avoid someone from using the trid in future, revert this patch. struct spdk_nvmf_qpair is defined] in the public header file, nvmf_transport.h but it is mainly for pluggable custom transport. Any custom transport will not use the trid, and so even if we remove it, we will have no issue. Change-Id: If4656edf3ac68456e758013d487eb582699750aa Signed-off-by: Shuhei Matsumoto Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5614 Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Anil Veerabhadrappa Reviewed-by: Aleksey Marchuk Reviewed-by: Changpeng Liu Reviewed-by: Jacek Kalwas --- include/spdk/nvmf_transport.h | 1 - lib/nvmf/rdma.c | 1 - lib/nvmf/tcp.c | 1 - 3 files changed, 3 deletions(-) diff --git a/include/spdk/nvmf_transport.h b/include/spdk/nvmf_transport.h index 30a4ea62b..e3d6e75e5 100644 --- a/include/spdk/nvmf_transport.h +++ b/include/spdk/nvmf_transport.h @@ -119,7 +119,6 @@ struct spdk_nvmf_qpair { struct spdk_nvmf_transport *transport; struct spdk_nvmf_ctrlr *ctrlr; struct spdk_nvmf_poll_group *group; - const struct spdk_nvme_transport_id *trid; uint16_t qid; uint16_t sq_head; diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c index b35ed70d1..2edcb99e3 100644 --- a/lib/nvmf/rdma.c +++ b/lib/nvmf/rdma.c @@ -1319,7 +1319,6 @@ nvmf_rdma_connect(struct spdk_nvmf_transport *transport, struct rdma_cm_event *e rqpair->cm_id = event->id; rqpair->listen_id = event->listen_id; rqpair->qpair.transport = transport; - rqpair->qpair.trid = port->trid; STAILQ_INIT(&rqpair->ibv_events); /* use qid from the private data to determine the qpair type qid will be set to the appropriate value when the controller is created */ diff --git a/lib/nvmf/tcp.c b/lib/nvmf/tcp.c index 4b30196f8..7e2707f57 100644 --- a/lib/nvmf/tcp.c +++ b/lib/nvmf/tcp.c @@ -966,7 +966,6 @@ nvmf_tcp_handle_connect(struct spdk_nvmf_transport *transport, tqpair->state_cntr[TCP_REQUEST_STATE_FREE] = 0; tqpair->port = port; tqpair->qpair.transport = transport; - tqpair->qpair.trid = port->trid; rc = spdk_sock_getaddr(tqpair->sock, tqpair->target_addr, sizeof(tqpair->target_addr), &tqpair->target_port,