Commit c7d6b2c2 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Use scsi_cmd_to_rq() instead of scsi_cmnd.request 

Prepare for removal of the request pointer by using scsi_cmd_to_rq()
instead. This patch does not change any functionality.

Link: https://lore.kernel.org/r/20210809230355.8186-39-bvanassche@acm.org


Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 3f5e62c5

drivers/scsi/qla2xxx/qla_os.c

+2 −2
Original line number Diff line number Diff line
@@ -854,7 +854,7 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) 
		uint16_t hwq;

		struct qla_qpair *qpair = NULL;



		tag = blk_mq_unique_tag(cmd->request);

		tag = blk_mq_unique_tag(scsi_cmd_to_rq(cmd));

		hwq = blk_mq_unique_tag_to_hwq(tag);

		qpair = ha->queue_pair_map[hwq];
@@ -1763,7 +1763,7 @@ static void qla2x00_abort_srb(struct qla_qpair *qp, srb_t *sp, const int res, 
		}



		spin_lock_irqsave(qp->qp_lock_ptr, *flags);

		if (ret_cmd && blk_mq_request_started(cmd->request))

		if (ret_cmd && blk_mq_request_started(scsi_cmd_to_rq(cmd)))

			sp->done(sp, res);

	} else {

		sp->done(sp, res);