Commit 63a60a0c authored by Ben Walker's avatar Ben Walker Committed by Tomasz Zawadzki
Browse files

nvmf/tcp: Fix r2t completion callback 



This was calling a callback for another function which
attempted to release the request. The code only worked because
in the r2t case the cb_arg was set to NULL, and that makes
the request free function do nothing.

Change-Id: Id9ec30ceb0eaa41deb67aa995da5d6f786d9b9f0
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/479903


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarOr Gerlitz <gerlitz.or@gmail.com>
Reviewed-by: default avatarZiye Yang <ziye.yang@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 2112c8bf

lib/nvmf/tcp.c

+8 −4
Original line number Diff line number Diff line
@@ -366,9 +366,7 @@ nvmf_tcp_request_free(struct spdk_nvmf_tcp_req *tcp_req) 
{

	struct spdk_nvmf_tcp_transport *ttransport;



	if (!tcp_req) {

		return;

	}

	assert(tcp_req != NULL);



	SPDK_DEBUGLOG(SPDK_LOG_NVMF_TCP, "tcp_req=%p will be freed\n", tcp_req);

	ttransport = SPDK_CONTAINEROF(tcp_req->req.qpair->transport,
@@ -1445,6 +1443,12 @@ spdk_nvmf_tcp_pdu_c2h_data_complete(void *cb_arg) 
	spdk_nvmf_tcp_handle_pending_c2h_data_queue(tqpair);

}



static void

spdk_nvmf_tcp_r2t_complete(void *cb_arg)

{

	/* Nothing to do. */

}



static void

spdk_nvmf_tcp_send_r2t_pdu(struct spdk_nvmf_tcp_qpair *tqpair,

			   struct spdk_nvmf_tcp_req *tcp_req)
@@ -1473,7 +1477,7 @@ spdk_nvmf_tcp_send_r2t_pdu(struct spdk_nvmf_tcp_qpair *tqpair, 
	SPDK_DEBUGLOG(SPDK_LOG_NVMF_TCP,

		      "tcp_req(%p) on tqpair(%p), r2t_info: cccid=%u, ttag=%u, r2to=%u, r2tl=%u\n",

		      tcp_req, tqpair, r2t->cccid, r2t->ttag, r2t->r2to, r2t->r2tl);

	spdk_nvmf_tcp_qpair_write_pdu(tqpair, rsp_pdu, spdk_nvmf_tcp_pdu_cmd_complete, NULL);

	spdk_nvmf_tcp_qpair_write_pdu(tqpair, rsp_pdu, spdk_nvmf_tcp_r2t_complete, tcp_req);

}



static void