From e13da83e4aa5b0a102477a26d2d10a0da53c1804 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Mon, 29 Apr 2019 14:18:00 -0700 Subject: [PATCH] nvmf: nvmf_tgt_host_trid stores a pg instead of a core Change-Id: I53bb89f6999ab9bbc4bd8e960970454d60beebee Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/452473 Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Seth Howell Reviewed-by: Jim Harris --- lib/event/subsystems/nvmf/nvmf_tgt.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/event/subsystems/nvmf/nvmf_tgt.c b/lib/event/subsystems/nvmf/nvmf_tgt.c index d19d1245c..a319906e9 100644 --- a/lib/event/subsystems/nvmf/nvmf_tgt.c +++ b/lib/event/subsystems/nvmf/nvmf_tgt.c @@ -62,7 +62,7 @@ struct nvmf_tgt_poll_group { struct nvmf_tgt_host_trid { struct spdk_nvme_transport_id host_trid; - uint32_t core; + struct nvmf_tgt_poll_group *pg; uint32_t ref; TAILQ_ENTRY(nvmf_tgt_host_trid) link; }; @@ -174,8 +174,7 @@ nvmf_tgt_get_pg(struct spdk_nvmf_qpair *qpair) if (tmp_trid && !strncmp(tmp_trid->host_trid.traddr, trid.traddr, SPDK_NVMF_TRADDR_MAX_LEN + 1)) { tmp_trid->ref++; - core = tmp_trid->core; - pg = &g_poll_groups[core]; + pg = tmp_trid->pg; break; } } @@ -188,7 +187,7 @@ nvmf_tgt_get_pg(struct spdk_nvmf_qpair *qpair) } /* Get the next available core for the new host */ pg = spdk_nvmf_get_next_pg(); - new_trid->core = pg->core; + new_trid->pg = pg; memcpy(new_trid->host_trid.traddr, trid.traddr, SPDK_NVMF_TRADDR_MAX_LEN + 1); TAILQ_INSERT_TAIL(&g_nvmf_tgt_host_trids, new_trid, link);