2 files changed, 22 insertions, 3 deletions

diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index ad1dc14bacce..80f4b849e2b0 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -1264,8 +1264,27 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha,
         struct abts_recv_from_24xx *abts, struct qla_tgt_sess *sess)
 {
         struct qla_hw_data *ha = vha->hw;
+        struct se_session *se_sess = sess->se_sess;
         struct qla_tgt_mgmt_cmd *mcmd;
+        struct se_cmd *se_cmd;
+        u32 lun = 0;
         int rc;
+        bool found_lun = false;
+
+        spin_lock(&se_sess->sess_cmd_lock);
+        list_for_each_entry(se_cmd, &se_sess->sess_cmd_list, se_cmd_list) {
+                struct qla_tgt_cmd *cmd =
+                        container_of(se_cmd, struct qla_tgt_cmd, se_cmd);
+                if (cmd->tag == abts->exchange_addr_to_abort) {
+                        lun = cmd->unpacked_lun;
+                        found_lun = true;
+                        break;
+                }
+        }
+        spin_unlock(&se_sess->sess_cmd_lock);
+
+        if (!found_lun)
+                return -ENOENT;
 
         ql_dbg(ql_dbg_tgt_mgt, vha, 0xf00f,
             "qla_target(%d): task abort (tag=%d)\n",
@@ -1283,7 +1302,7 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha,
         mcmd->sess = sess;
         memcpy(&mcmd->orig_iocb.abts, abts, sizeof(mcmd->orig_iocb.abts));
 
-        rc = ha->tgt.tgt_ops->handle_tmr(mcmd, 0, TMR_ABORT_TASK,
+        rc = ha->tgt.tgt_ops->handle_tmr(mcmd, lun, TMR_ABORT_TASK,
             abts->exchange_addr_to_abort);
         if (rc != 0) {
                 ql_dbg(ql_dbg_tgt_mgt, vha, 0xf052,
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index 4372e32bc95f..d182c96e17ea 100644
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -620,8 +620,8 @@ static void tcm_qla2xxx_handle_data_work(struct work_struct *work)
                         return;
                 }
 
-                cmd->se_cmd.scsi_sense_reason = TCM_CHECK_CONDITION_ABORT_CMD;
-                transport_generic_request_failure(&cmd->se_cmd);
+                transport_generic_request_failure(&cmd->se_cmd,
+                                                  TCM_CHECK_CONDITION_ABORT_CMD);
                 return;
         }