scsi: csiostor: 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-18-bvanassche@acm.org
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c
index 56b9ad0a1ca08f6dda5c471cc372c39d7653f557..3b2eb6ce1fcff07d6c941ed5f682438a3ee97e1f 100644 (file)
--- a/drivers/scsi/csiostor/csio_scsi.c
+++ b/drivers/scsi/csiostor/csio_scsi.c
@@ -1786,7 +1786,7 @@ csio_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmnd)
        struct csio_scsi_qset *sqset;
        struct fc_rport *rport = starget_to_rport(scsi_target(cmnd->device));
 
-       sqset = &hw->sqset[ln->portid][blk_mq_rq_cpu(cmnd->request)];
+       sqset = &hw->sqset[ln->portid][blk_mq_rq_cpu(scsi_cmd_to_rq(cmnd))];
 
        nr = fc_remote_port_chkready(rport);
        if (nr) {
@@ -1989,13 +1989,13 @@ inval_scmnd:
                csio_info(hw,
                        "Aborted SCSI command to (%d:%llu) tag %u\n",
                        cmnd->device->id, cmnd->device->lun,
-                       cmnd->request->tag);
+                       scsi_cmd_to_rq(cmnd)->tag);
                return SUCCESS;
        } else {
                csio_info(hw,
                        "Failed to abort SCSI command, (%d:%llu) tag %u\n",
                        cmnd->device->id, cmnd->device->lun,
-                       cmnd->request->tag);
+                       scsi_cmd_to_rq(cmnd)->tag);
                return FAILED;
        }
 }