From 304fde153b972e5675ec0564f7e94e21cc753187 Mon Sep 17 00:00:00 2001 From: Ziye Yang Date: Mon, 28 Dec 2020 20:31:18 +0800 Subject: [PATCH] nvmf/tcp: remove nvmf_tcp_pdu_cmd_complete This function can be removed if we change the parameter type in nvmf_tcp_request_free. Change-Id: I4dbf0e7fa79c8c0115d7bcae99cb241aec367f1a Signed-off-by: Ziye Yang Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5702 Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Aleksey Marchuk --- lib/nvmf/tcp.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/nvmf/tcp.c b/lib/nvmf/tcp.c index f92404e5d..be3a0d57f 100644 --- a/lib/nvmf/tcp.c +++ b/lib/nvmf/tcp.c @@ -368,9 +368,10 @@ nvmf_tcp_req_get(struct spdk_nvmf_tcp_qpair *tqpair) } static void -nvmf_tcp_request_free(struct spdk_nvmf_tcp_req *tcp_req) +nvmf_tcp_request_free(void *cb_arg) { struct spdk_nvmf_tcp_transport *ttransport; + struct spdk_nvmf_tcp_req *tcp_req = cb_arg; assert(tcp_req != NULL); @@ -1373,13 +1374,6 @@ err: nvmf_tcp_send_c2h_term_req(tqpair, pdu, fes, error_offset); } -static void -nvmf_tcp_pdu_cmd_complete(void *cb_arg) -{ - struct spdk_nvmf_tcp_req *tcp_req = cb_arg; - nvmf_tcp_request_free(tcp_req); -} - static void nvmf_tcp_send_capsule_resp_pdu(struct spdk_nvmf_tcp_req *tcp_req, struct spdk_nvmf_tcp_qpair *tqpair) @@ -1401,7 +1395,7 @@ nvmf_tcp_send_capsule_resp_pdu(struct spdk_nvmf_tcp_req *tcp_req, capsule_resp->common.plen += SPDK_NVME_TCP_DIGEST_LEN; } - nvmf_tcp_qpair_write_pdu(tqpair, rsp_pdu, nvmf_tcp_pdu_cmd_complete, tcp_req); + nvmf_tcp_qpair_write_pdu(tqpair, rsp_pdu, nvmf_tcp_request_free, tcp_req); } static void