From 55e12a6cdb6ca5a7402088ad6486e36ff1476a7e Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Mon, 28 Jan 2019 15:30:14 -0700 Subject: [PATCH] nvmf/tcp: Remove tqpair pointer from pdu This was only used by the target, and it didn't actually need it. Change-Id: Ibcef410165efdc16077da24419580ed51b087d70 Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/c/442440 Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris --- include/spdk_internal/nvme_tcp.h | 2 -- lib/nvmf/tcp.c | 10 +++------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/include/spdk_internal/nvme_tcp.h b/include/spdk_internal/nvme_tcp.h index ce70ce51e..923466d87 100644 --- a/include/spdk_internal/nvme_tcp.h +++ b/include/spdk_internal/nvme_tcp.h @@ -66,7 +66,6 @@ ((*((uint8_t *)(B)+2)) = (uint8_t)((uint32_t)(D) >> 16)), \ ((*((uint8_t *)(B)+3)) = (uint8_t)((uint32_t)(D) >> 24))) -struct nvme_tcp_qpair; typedef void (*nvme_tcp_qpair_xfer_complete_cb)(void *cb_arg); struct nvme_tcp_pdu { @@ -99,7 +98,6 @@ struct nvme_tcp_pdu { int ref; void *data; uint32_t data_len; - struct nvme_tcp_qpair *tqpair; uint32_t writev_offset; TAILQ_ENTRY(nvme_tcp_pdu) tailq; diff --git a/lib/nvmf/tcp.c b/lib/nvmf/tcp.c index 9e5356bef..aab369136 100644 --- a/lib/nvmf/tcp.c +++ b/lib/nvmf/tcp.c @@ -338,22 +338,18 @@ spdk_nvmf_tcp_pdu_get(struct nvme_tcp_qpair *tqpair) TAILQ_REMOVE(&tqpair->free_queue, pdu, tailq); memset(pdu, 0, sizeof(*pdu)); pdu->ref = 1; - pdu->tqpair = tqpair; return pdu; } static void -spdk_nvmf_tcp_pdu_put(struct nvme_tcp_pdu *pdu) +spdk_nvmf_tcp_pdu_put(struct nvme_tcp_qpair *tqpair, struct nvme_tcp_pdu *pdu) { - struct nvme_tcp_qpair *tqpair; if (!pdu) { return; } assert(pdu->ref > 0); - assert(pdu->tqpair != NULL); - tqpair = pdu->tqpair; pdu->ref--; if (pdu->ref == 0) { @@ -454,7 +450,7 @@ spdk_nvmf_tcp_cleanup_all_states(struct nvme_tcp_qpair *tqpair) assert(tqpair->c2h_data_pdu_cnt > 0); tqpair->c2h_data_pdu_cnt--; } - spdk_nvmf_tcp_pdu_put(pdu); + spdk_nvmf_tcp_pdu_put(tqpair, pdu); } TAILQ_FOREACH_SAFE(tcp_req, &tqpair->queued_c2h_data_tcp_req, link, req_tmp) { @@ -893,7 +889,7 @@ spdk_nvmf_tcp_qpair_flush_pdus_internal(struct nvme_tcp_qpair *tqpair) TAILQ_REMOVE(&completed_pdus_list, pdu, tailq); assert(pdu->cb_fn != NULL); pdu->cb_fn(pdu->cb_arg); - spdk_nvmf_tcp_pdu_put(pdu); + spdk_nvmf_tcp_pdu_put(tqpair, pdu); } ttransport = SPDK_CONTAINEROF(tqpair->qpair.transport, struct spdk_nvmf_tcp_transport, transport);