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

Commit c1f97cc2 authored by Bart Van Assche's avatar Bart Van Assche Committed by Greg Kroah-Hartman
Browse files

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

[ Upstream commit c7d6b2c2cd5656b05849afb0de3f422da1742d0f ]

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>
Stable-dep-of: 19597cad64d6 ("scsi: qla2xxx: Fix system crash due to bad pointer access")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent df011042

drivers/scsi/qla2xxx/qla_os.c

+2 −2
Original line number Diff line number Diff line
@@ -814,7 +814,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];
@@ -1705,7 +1705,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);