Commit 8c3b9204 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

Revert "lib/nvmf: Add trid to struct spdk_nvmf_qpair" 



This reverts commit e21de9a9.

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: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5614


Community-CI: Broadcom CI
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAnil Veerabhadrappa <anil.veerabhadrappa@broadcom.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJacek Kalwas <jacek.kalwas@intel.com>
parent 6cf97693

include/spdk/nvmf_transport.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

lib/nvmf/rdma.c

+0 −1
Original line number Diff line number Diff line
@@ -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 */

lib/nvmf/tcp.c

+0 −1
Original line number Diff line number Diff line
@@ -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,