[SCSI] qla2xxx: Correct NULL pointer bug in cpu affinity mode.
This patch fixes a NULL pointer bug that occurs when IO is being
carried out on a vport for which the cpu affinity mode is turned on.
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index b4c6010..13396be 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -15,7 +15,7 @@
struct rsp_que *rsp);
static void qla2x00_isp_cmd(struct scsi_qla_host *, struct req_que *);
-static void qla25xx_set_que(srb_t *, struct req_que **, struct rsp_que **);
+static void qla25xx_set_que(srb_t *, struct rsp_que **);
/**
* qla2x00_get_cmd_direction() - Determine control_flag data direction.
* @cmd: SCSI command
@@ -722,7 +722,8 @@
/* Setup device pointers. */
ret = 0;
- qla25xx_set_que(sp, &req, &rsp);
+ qla25xx_set_que(sp, &rsp);
+ req = vha->req;
/* So we know we haven't pci_map'ed anything yet */
tot_dsds = 0;
@@ -845,20 +846,15 @@
return QLA_FUNCTION_FAILED;
}
-static void qla25xx_set_que(srb_t *sp, struct req_que **req,
- struct rsp_que **rsp)
+static void qla25xx_set_que(srb_t *sp, struct rsp_que **rsp)
{
struct scsi_cmnd *cmd = sp->cmd;
- struct scsi_qla_host *vha = sp->fcport->vha;
struct qla_hw_data *ha = sp->fcport->vha->hw;
int affinity = cmd->request->cpu;
if (ql2xmultique_tag && affinity >= 0 &&
- affinity < ha->max_rsp_queues - 1) {
+ affinity < ha->max_rsp_queues - 1)
*rsp = ha->rsp_q_map[affinity + 1];
- *req = ha->req_q_map[1];
- } else {
- *req = vha->req;
+ else
*rsp = ha->rsp_q_map[0];
- }
}
