From 10c0bc4f6549cb7fda25570600b61b280d7791c8 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Fri, 24 Aug 2012 21:15:38 +0000 Subject: [PATCH] Retried commands should go to the local exec stage + small logging improvements It is needed, because local commands can also be retried git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4473 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/scst_lib.c | 7 +++++-- scst/src/scst_targ.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index 47bace07c..627d26e87 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -7649,7 +7649,8 @@ int scst_set_pending_UA(struct scst_cmd *cmd, uint8_t *buf, int *size) goto out; } - TRACE_MGMT_DBG("Setting pending UA cmd %p", cmd); + TRACE_MGMT_DBG("Setting pending UA cmd %p (dev %s, initiator %s)", cmd, + cmd->dev->virt_name, cmd->sess->initiator_name); spin_lock_bh(&cmd->tgt_dev->tgt_dev_lock); @@ -7829,7 +7830,9 @@ static void __scst_check_set_UA(struct scst_tgt_dev *tgt_dev, list_for_each_entry(UA_entry_tmp, &tgt_dev->UA_list, UA_list_entry) { if (memcmp(sense, UA_entry_tmp->UA_sense_buffer, len) == 0) { - TRACE_MGMT_DBG("%s", "UA already exists"); + TRACE_MGMT_DBG("UA already exists (dev %s, " + "initiator %s)", tgt_dev->dev->virt_name, + tgt_dev->sess->initiator_name); skip_UA = 1; break; } diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c index 6cd1ec4ca..19c560fd3 100644 --- a/scst/src/scst_targ.c +++ b/scst/src/scst_targ.c @@ -3013,7 +3013,7 @@ static int scst_check_sense(struct scst_cmd *cmd) cmd->resp_data_len = cmd->dbl_ua_orig_resp_data_len; - cmd->state = SCST_CMD_STATE_REAL_EXEC; + cmd->state = SCST_CMD_STATE_LOCAL_EXEC; cmd->retry = 1; res = 1; goto out;