|
@@ -500,7 +500,6 @@ static int tcm_qla2xxx_handle_cmd(scsi_qla_host_t *vha, struct qla_tgt_cmd *cmd,
|
|
|
static void tcm_qla2xxx_handle_data_work(struct work_struct *work)
|
|
|
{
|
|
|
struct qla_tgt_cmd *cmd = container_of(work, struct qla_tgt_cmd, work);
|
|
|
- unsigned long flags;
|
|
|
|
|
|
/*
|
|
|
* Ensure that the complete FCP WRITE payload has been received.
|
|
@@ -508,17 +507,6 @@ static void tcm_qla2xxx_handle_data_work(struct work_struct *work)
|
|
|
*/
|
|
|
cmd->cmd_in_wq = 0;
|
|
|
|
|
|
- spin_lock_irqsave(&cmd->cmd_lock, flags);
|
|
|
- cmd->data_work = 1;
|
|
|
- if (cmd->aborted) {
|
|
|
- cmd->data_work_free = 1;
|
|
|
- spin_unlock_irqrestore(&cmd->cmd_lock, flags);
|
|
|
-
|
|
|
- tcm_qla2xxx_free_cmd(cmd);
|
|
|
- return;
|
|
|
- }
|
|
|
- spin_unlock_irqrestore(&cmd->cmd_lock, flags);
|
|
|
-
|
|
|
cmd->qpair->tgt_counters.qla_core_ret_ctio++;
|
|
|
if (!cmd->write_data_transferred) {
|
|
|
/*
|
|
@@ -765,31 +753,13 @@ static void tcm_qla2xxx_queue_tm_rsp(struct se_cmd *se_cmd)
|
|
|
qlt_xmit_tm_rsp(mcmd);
|
|
|
}
|
|
|
|
|
|
-#define DATA_WORK_NOT_FREE(_cmd) (_cmd->data_work && !_cmd->data_work_free)
|
|
|
static void tcm_qla2xxx_aborted_task(struct se_cmd *se_cmd)
|
|
|
{
|
|
|
struct qla_tgt_cmd *cmd = container_of(se_cmd,
|
|
|
struct qla_tgt_cmd, se_cmd);
|
|
|
- unsigned long flags;
|
|
|
|
|
|
if (qlt_abort_cmd(cmd))
|
|
|
return;
|
|
|
-
|
|
|
- spin_lock_irqsave(&cmd->cmd_lock, flags);
|
|
|
- if ((cmd->state == QLA_TGT_STATE_NEW)||
|
|
|
- ((cmd->state == QLA_TGT_STATE_DATA_IN) &&
|
|
|
- DATA_WORK_NOT_FREE(cmd))) {
|
|
|
- cmd->data_work_free = 1;
|
|
|
- spin_unlock_irqrestore(&cmd->cmd_lock, flags);
|
|
|
- /*
|
|
|
- * cmd has not reached fw, Use this trigger to free it.
|
|
|
- */
|
|
|
- tcm_qla2xxx_free_cmd(cmd);
|
|
|
- return;
|
|
|
- }
|
|
|
- spin_unlock_irqrestore(&cmd->cmd_lock, flags);
|
|
|
- return;
|
|
|
-
|
|
|
}
|
|
|
|
|
|
static void tcm_qla2xxx_clear_sess_lookup(struct tcm_qla2xxx_lport *,
|