qla2xxx: Remove direct access of scsi_status field in se_cmd

Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 5b1287a63c494b6edf8fcf7e8ec75a17530032db..4aae861a671331dcbd37977b2749d277364933f2 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -1794,6 +1794,7 @@ typedef struct {
 #define SS_RESIDUAL_OVER               BIT_10
 #define SS_SENSE_LEN_VALID             BIT_9
 #define SS_RESPONSE_INFO_LEN_VALID     BIT_8
+#define SS_SCSI_STATUS_BYTE    0xff
 
 #define SS_RESERVE_CONFLICT            (BIT_4 | BIT_3)
 #define SS_BUSY_CONDITION              BIT_3

diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index e4fda84b959eca2d52aa009c353cbe7f5ffc94bd..439c1fc44c7a4849a131b5c7669ae78e7e4864bb 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -2288,7 +2288,7 @@ static void qlt_24xx_init_ctio_to_isp(struct ctio7_to_24xx *ctio,
                int i;
 
                if (qlt_need_explicit_conf(prm->tgt->ha, prm->cmd, 1)) {
-                       if (prm->cmd->se_cmd.scsi_status != 0) {
+                       if ((prm->rq_result & SS_SCSI_STATUS_BYTE) != 0) {
                                ql_dbg(ql_dbg_tgt, prm->cmd->vha, 0xe017,
                                    "Skipping EXPLICIT_CONFORM and "
                                    "CTIO7_FLAGS_CONFORM_REQ for FCP READ w/ "