From a194f8e23e33ed7fdc55e5e8824e0904ddbf73cb Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Fri, 20 May 2011 22:44:48 +0000 Subject: [PATCH] Merge of the trunk's r3450 (partially leaked in the previous merge) TM handling fixes, part2, hopefully, final. git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.0.0.x@3468 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/iscsi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/iscsi-scst/kernel/iscsi.c b/iscsi-scst/kernel/iscsi.c index 772372b5b..3f3e69a02 100644 --- a/iscsi-scst/kernel/iscsi.c +++ b/iscsi-scst/kernel/iscsi.c @@ -642,6 +642,7 @@ static void req_cmnd_pre_release(struct iscsi_cmnd *req) if (unlikely(req->hashed)) { /* It sometimes can happen during errors recovery */ + TRACE_MGMT_DBG("Removing req %p from hash", req); cmnd_remove_data_wait_hash(req); } @@ -2984,9 +2985,9 @@ static void iscsi_push_cmnd(struct iscsi_cmnd *cmnd) if (unlikely(before(cmd_sn, session->exp_cmd_sn))) { TRACE_MGMT_DBG("Ignoring out of expected range cmd_sn " - "(sn %u, exp_sn %u, op %x, CDB op %x)", cmd_sn, - session->exp_cmd_sn, cmnd_opcode(cmnd), - cmnd_scsicode(cmnd)); + "(sn %u, exp_sn %u, cmd %p, op %x, CDB op %x)", + cmd_sn, session->exp_cmd_sn, cmnd, + cmnd_opcode(cmnd), cmnd_scsicode(cmnd)); drop = 1; }