Commit 64e0e380 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

Revert: "Replace conn_free_pdu() by task_put() and put_pdu() in remove_acked_pdu()" 



This revert commit 6e4e85dc.

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: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Ia398fd295769b786ba4777cc9f7df6e134f15e48
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/475791


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarZiye Yang <ziye.yang@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent fe5a9696

lib/iscsi/iscsi.c

+1 −4
Original line number Diff line number Diff line
@@ -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);

		}

	}

}