From 694ea5608abd00feb8a1c7e89da744813fccb0ef Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 3 Apr 2019 00:57:59 +0000 Subject: [PATCH] qla2x00t-32gbit, target: Backport to kernel-3.0 Avoid using se_cmd.t_task_cdb because that member is not available in kernel v3.0. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8145 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c | 2 -- qla2x00t-32gbit/qla_target.c | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c b/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c index 1805c3fee..964d3673c 100644 --- a/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c +++ b/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c @@ -1695,7 +1695,6 @@ static int sqa_xmit_response(struct scst_cmd *scst_cmd) cmd->offset = scst_cmd_get_ppl_offset(scst_cmd); cmd->scsi_status = scst_cmd_get_status(scst_cmd); cmd->cdb = (unsigned char *) scst_cmd_get_cdb(scst_cmd); - cmd->se_cmd.t_task_cdb = (unsigned char *) scst_cmd_get_cdb(scst_cmd); cmd->lba = scst_cmd_get_lba(scst_cmd); cmd->trc_flags |= TRC_XMIT_STATUS; @@ -1780,7 +1779,6 @@ static int sqa_rdy_to_xfer(struct scst_cmd *scst_cmd) scst_to_tgt_dma_dir(scst_cmd_get_data_direction(scst_cmd)); cmd->cdb = (unsigned char *) scst_cmd_get_cdb(scst_cmd); - cmd->se_cmd.t_task_cdb = (unsigned char *) scst_cmd_get_cdb(scst_cmd); cmd->sg = scst_cmd_get_sg(scst_cmd); cmd->sg_cnt = scst_cmd_get_sg_cnt(scst_cmd); cmd->scsi_status = scst_cmd_get_status(scst_cmd); diff --git a/qla2x00t-32gbit/qla_target.c b/qla2x00t-32gbit/qla_target.c index 50ccb55fd..cd703947c 100644 --- a/qla2x00t-32gbit/qla_target.c +++ b/qla2x00t-32gbit/qla_target.c @@ -2834,15 +2834,15 @@ static int qlt_pre_xmit_response(struct qla_tgt_cmd *cmd, ql_dbg_qp(ql_dbg_io + ql_dbg_verbose, qpair, 0x305c, "Residual underflow: %d (tag %lld, op %x, bufflen %d, rq_result %x)\n", prm->residual, se_cmd_tag(se_cmd), - se_cmd->t_task_cdb ? se_cmd->t_task_cdb[0] : 0, + cmd->cdb ? cmd->cdb[0] : 0, cmd->bufflen, prm->rq_result); prm->rq_result |= SS_RESIDUAL_UNDER; } else if (se_cmd->se_cmd_flags & SCF_OVERFLOW_BIT) { prm->residual = se_cmd->residual_count; ql_dbg_qp(ql_dbg_io, qpair, 0x305d, "Residual overflow: %d (tag %lld, op %x, bufflen %d, rq_result %x)\n", - prm->residual, se_cmd_tag(se_cmd), se_cmd->t_task_cdb ? - se_cmd->t_task_cdb[0] : 0, cmd->bufflen, prm->rq_result); + prm->residual, se_cmd_tag(se_cmd), cmd->cdb ? + cmd->cdb[0] : 0, cmd->bufflen, prm->rq_result); prm->rq_result |= SS_RESIDUAL_OVER; }