From: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>
Update lio-core.git qla2xxx LLD code to address some minor build
breakages from the v3.4-rc2 merge to follow 8.03.07.13-k code that
had been fixed in target-pending.git/for-next-merge.
This includes the qla2x00_gid_list_size() conversion and update the
scsi_cmnd reference within qla2xxx_abort_fcport_cmds().
Cc: Arun Easi <arun.easi@xxxxxxxxxx>
Signed-off-by: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>
---
drivers/scsi/qla2xxx/qla_gbl.h | 1 +
drivers/scsi/qla2xxx/qla_os.c | 6 +++---
drivers/scsi/qla2xxx/qla_target.c | 8 ++++----
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 60b74c8..fa9c414 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -552,6 +552,7 @@ extern void qla2x00_sp_free(void *, void *);
extern void qla2x00_sp_timeout(unsigned long);
extern void qla2x00_bsg_job_done(void *, void *, int);
extern void qla2x00_bsg_sp_free(void *, void *);
+extern void qla2x00_start_iocbs(struct scsi_qla_host *, struct req_que *);
/* Interrupt related */
extern irqreturn_t qla82xx_intr_handler(int, void *);
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index c779501..7ea2366 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -911,12 +911,12 @@ qla2xxx_abort_fcport_cmds(fc_port_t *fcport)
spin_unlock_irqrestore(&ha->hardware_lock, flags);
if (ha->isp_ops->abort_command(sp)) {
ql_dbg(ql_dbg_taskm, vha, 0x8010,
- "Abort failed -- %lx\n", sp->cmd->serial_number);
+ "Abort failed -- %lx\n", sp->u.scmd.cmd->serial_number);
} else {
- if (qla2x00_eh_wait_on_command(sp->cmd) != QLA_SUCCESS)
+ if (qla2x00_eh_wait_on_command(sp->u.scmd.cmd) != QLA_SUCCESS)
ql_dbg(ql_dbg_taskm, vha, 0x8011,
"Abort failed while waiting -- %lx\n",
- sp->cmd->serial_number);
+ sp->u.scmd.cmd->serial_number);
}
spin_lock_irqsave(&ha->hardware_lock, flags);
}
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index c834ef3..6610a3e 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -498,11 +498,11 @@ static int qla24xx_get_loop_id(struct scsi_qla_host *vha, const uint8_t *s_id,
int res, rc, i;
uint16_t entries;
- gid_list = dma_alloc_coherent(&ha->pdev->dev, GID_LIST_SIZE,
+ gid_list = dma_alloc_coherent(&ha->pdev->dev, qla2x00_gid_list_size(ha),
&gid_list_dma, GFP_KERNEL);
if (!gid_list) {
- printk(KERN_ERR "qla_target(%d): DMA Alloc failed of %zd\n",
- vha->vp_idx, GID_LIST_SIZE);
+ printk(KERN_ERR "qla_target(%d): DMA Alloc failed of %u\n",
+ vha->vp_idx, qla2x00_gid_list_size(ha));
return -ENOMEM;
}
@@ -530,7 +530,7 @@ static int qla24xx_get_loop_id(struct scsi_qla_host *vha, const uint8_t *s_id,
}
out_free_id_list:
- dma_free_coherent(&ha->pdev->dev, GID_LIST_SIZE, gid_list, gid_list_dma);
+ dma_free_coherent(&ha->pdev->dev, qla2x00_gid_list_size(ha), gid_list, gid_list_dma);
return res;
}
--
1.7.2.5
--
To unsubscribe from this list: send the line "unsubscribe target-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
