From 64e0e380a30c27e09dea6f8765430c79150c8699 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Mon, 25 Nov 2019 16:45:16 -0500 Subject: [PATCH] Revert: "Replace conn_free_pdu() by task_put() and put_pdu() in remove_acked_pdu()" This revert commit 6e4e85dcef91e6793b554a5d15c72ba93e56a4ab. Causing intermittent build pool failures. We had different operations in remove_acked_pdu() and _iscsi_conn_free_tasks(). The patch tried to unify them but was wrong. The operation in removed_acked_pdu() was correct. This patch restores it. The next patch will fix the operation in _iscsi_conn_free_tasks(). Signed-off-by: Shuhei Matsumoto Change-Id: Ia398fd295769b786ba4777cc9f7df6e134f15e48 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/475791 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Ziye Yang Reviewed-by: Changpeng Liu --- lib/iscsi/iscsi.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/iscsi/iscsi.c b/lib/iscsi/iscsi.c index bfe2fb960..08e0a4206 100644 --- a/lib/iscsi/iscsi.c +++ b/lib/iscsi/iscsi.c @@ -4561,10 +4561,7 @@ remove_acked_pdu(struct spdk_iscsi_conn *conn, uint32_t ExpStatSN) stat_sn = from_be32(&pdu->bhs.stat_sn); if (SN32_LT(stat_sn, conn->exp_statsn)) { TAILQ_REMOVE(&conn->snack_pdu_list, pdu, tailq); - if (pdu->task) { - spdk_iscsi_task_put(pdu->task); - } - spdk_put_pdu(pdu); + spdk_iscsi_conn_free_pdu(conn, pdu); } } }