mirror of
https://github.com/SCST-project/scst.git
synced 2026-05-17 10:41:26 +00:00
qla2x00t-32gbit: Drop TARGET_SCF_LOOKUP_LUN_FROM_TAG
Only the __qlt_24xx_handle_abts() code path does not know the LUN for an abort and it uses the TARGET_SCF_LOOKUP_LUN_FROM_TAG flag to have LIO core look it up. LIO uses target_lookup_lun_from_tag to go from cmd tag to LUN for the driver. However, qla2xxx has a tcm_qla2xxx_find_cmd_by_tag() which does almost the same thing as the LIO helper (it finds the cmd but does not return the LUN). This patch has qla2xxx use its internal helper. Link: https://lore.kernel.org/r/1604257174-4524-4-git-send-email-michael.christie@oracle.com Cc: Nilesh Javali <njavali@marvell.com> Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com> Signed-off-by: Mike Christie <michael.christie@oracle.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> See also upstream commit 8f394da36a361cbe0e1e8b1d4213e5598c8095ac. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9286 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
@@ -2098,6 +2098,7 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha,
|
||||
struct qla_hw_data *ha = vha->hw;
|
||||
struct qla_tgt_mgmt_cmd *mcmd;
|
||||
struct qla_qpair_hint *h = &vha->vha_tgt.qla_tgt->qphints[0];
|
||||
struct qla_tgt_cmd *abort_cmd;
|
||||
|
||||
ql_dbg(ql_dbg_tgt_mgt, vha, 0xf00f,
|
||||
"qla_target(%d): task abort (tag=%d)\n",
|
||||
@@ -2127,21 +2128,19 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha,
|
||||
mcmd->se_cmd.cpuid = h->cpuid;
|
||||
#endif
|
||||
|
||||
if (ha->tgt.tgt_ops->find_cmd_by_tag) {
|
||||
struct qla_tgt_cmd *abort_cmd;
|
||||
|
||||
abort_cmd = ha->tgt.tgt_ops->find_cmd_by_tag(sess,
|
||||
le32_to_cpu(abts->exchange_addr_to_abort));
|
||||
if (abort_cmd && abort_cmd->qpair) {
|
||||
mcmd->qpair = abort_cmd->qpair;
|
||||
#if HAVE_SE_CMD_CPUID
|
||||
mcmd->se_cmd.cpuid = abort_cmd->se_cmd.cpuid;
|
||||
#endif
|
||||
mcmd->abort_io_attr = abort_cmd->atio.u.isp24.attr;
|
||||
mcmd->flags = QLA24XX_MGMT_ABORT_IO_ATTR_VALID;
|
||||
}
|
||||
}
|
||||
abort_cmd = ha->tgt.tgt_ops->find_cmd_by_tag(sess,
|
||||
le32_to_cpu(abts->exchange_addr_to_abort));
|
||||
if (!abort_cmd)
|
||||
return -EIO;
|
||||
mcmd->unpacked_lun = abort_cmd->se_cmd.orig_fe_lun;
|
||||
|
||||
if (abort_cmd->qpair) {
|
||||
mcmd->qpair = abort_cmd->qpair;
|
||||
mcmd->se_cmd.cpuid = abort_cmd->se_cmd.cpuid;
|
||||
mcmd->abort_io_attr = abort_cmd->atio.u.isp24.attr;
|
||||
mcmd->flags = QLA24XX_MGMT_ABORT_IO_ATTR_VALID;
|
||||
}
|
||||
|
||||
INIT_WORK(&mcmd->work, qlt_do_tmr_work);
|
||||
#if HAVE_SE_CMD_CPUID
|
||||
queue_work_on(mcmd->se_cmd.cpuid, qla_tgt_wq, &mcmd->work);
|
||||
|
||||
Reference in New Issue
Block a user