Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8a544c9 authored by Quinn Tran's avatar Quinn Tran Committed by Greg Kroah-Hartman
Browse files

qla2xxx: Fix wrong IOCB type assumption 




[ Upstream commit bb1181c9a8b46b6f10e749d9ed94480336445d7f ]

qlt_reset is called with Immedidate Notify IOCB only.
Current code wrongly cast it as ATIO IOCB.

Signed-off-by: default avatarQuinn Tran <quinn.tran@cavium.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 57e76dbb

drivers/scsi/qla2xxx/qla_target.c

+1 −7
Original line number Diff line number Diff line
@@ -668,11 +668,9 @@ static int qlt_reset(struct scsi_qla_host *vha, void *iocb, int mcmd) 
{

	struct qla_hw_data *ha = vha->hw;

	struct qla_tgt_sess *sess = NULL;

	uint32_t unpacked_lun, lun = 0;

	uint16_t loop_id;

	int res = 0;

	struct imm_ntfy_from_isp *n = (struct imm_ntfy_from_isp *)iocb;

	struct atio_from_isp *a = (struct atio_from_isp *)iocb;

	unsigned long flags;



	loop_id = le16_to_cpu(n->u.isp24.nport_handle);
@@ -725,11 +723,7 @@ static int qlt_reset(struct scsi_qla_host *vha, void *iocb, int mcmd) 
	    "loop_id %d)\n", vha->host_no, sess, sess->port_name,

	    mcmd, loop_id);



	lun = a->u.isp24.fcp_cmnd.lun;

	unpacked_lun = scsilun_to_int((struct scsi_lun *)&lun);



	return qlt_issue_task_mgmt(sess, unpacked_lun, mcmd,

	    iocb, QLA24XX_MGMT_SEND_NACK);

	return qlt_issue_task_mgmt(sess, 0, mcmd, iocb, QLA24XX_MGMT_SEND_NACK);

}



/* ha->tgt.sess_lock supposed to be held on entry */