From 193e63d118cba04c2b6b7b3cc3917d974aaa8101 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 3 Nov 2021 14:29:35 +0000 Subject: [PATCH] qla2x00t: Port to Linux kernel v5.15 git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9593 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t/qla_iocb.c | 2 +- qla2x00t/qla_os.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qla2x00t/qla_iocb.c b/qla2x00t/qla_iocb.c index ae0f8ba0f..7584de906 100644 --- a/qla2x00t/qla_iocb.c +++ b/qla2x00t/qla_iocb.c @@ -1875,7 +1875,7 @@ static void qla25xx_set_que(srb_t *sp, struct rsp_que **rsp) { struct scsi_cmnd *cmd = GET_CMD_SP(sp); struct qla_hw_data *ha = sp->fcport->vha->hw; - int affinity = scst_blk_rq_cpu(cmd->request); + int affinity = scst_blk_rq_cpu(scsi_cmd_to_rq(cmd)); if (ha->flags.cpu_affinity_enabled && affinity >= 0 && affinity < ha->max_rsp_queues - 1) diff --git a/qla2x00t/qla_os.c b/qla2x00t/qla_os.c index b9d3741a4..0e86d1df5 100644 --- a/qla2x00t/qla_os.c +++ b/qla2x00t/qla_os.c @@ -1146,7 +1146,7 @@ __qla2xxx_eh_generic_reset(char *name, enum nexus_wait_type type, } err = 2; if (do_reset(fcport, cmd->device->lun, - scst_blk_rq_cpu(cmd->request) + 1) + scst_blk_rq_cpu(scsi_cmd_to_rq(cmd)) + 1) != QLA_SUCCESS) { ql_log(ql_log_warn, vha, 0x800c, "do_reset failed for cmd=%p.\n", cmd);