Commit cad1a780 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen

scsi: libsas: 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-27-bvanassche@acm.orgReviewed-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 240ec119
...@@ -596,7 +596,7 @@ void sas_ata_task_abort(struct sas_task *task) ...@@ -596,7 +596,7 @@ void sas_ata_task_abort(struct sas_task *task)
/* Bounce SCSI-initiated commands to the SCSI EH */ /* Bounce SCSI-initiated commands to the SCSI EH */
if (qc->scsicmd) { if (qc->scsicmd) {
blk_abort_request(qc->scsicmd->request); blk_abort_request(scsi_cmd_to_rq(qc->scsicmd));
return; return;
} }
......
...@@ -908,7 +908,7 @@ void sas_task_abort(struct sas_task *task) ...@@ -908,7 +908,7 @@ void sas_task_abort(struct sas_task *task)
if (dev_is_sata(task->dev)) if (dev_is_sata(task->dev))
sas_ata_task_abort(task); sas_ata_task_abort(task);
else else
blk_abort_request(sc->request); blk_abort_request(scsi_cmd_to_rq(sc));
} }
int sas_slave_alloc(struct scsi_device *sdev) int sas_slave_alloc(struct scsi_device *sdev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment