UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Bart Van Assche 2021-08-09 16:03:20 -07:00 committed by Martin K. Petersen
parent 4bfb9809b8
commit c14f1fee18
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/csiostor/csio_scsi.c
View File

@ -1786,7 +1786,7 @@ csio_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmnd)
struct csio_scsi_qset *sqset; struct csio_scsi_qset *sqset;
struct fc_rport *rport = starget_to_rport(scsi_target(cmnd->device)); 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); nr = fc_remote_port_chkready(rport);
if (nr) { if (nr) {
@ -1989,13 +1989,13 @@ inval_scmnd:
csio_info(hw, csio_info(hw,
"Aborted SCSI command to (%d:%llu) tag %u\n", "Aborted SCSI command to (%d:%llu) tag %u\n",
cmnd->device->id, cmnd->device->lun, cmnd->device->id, cmnd->device->lun,
cmnd->request->tag); scsi_cmd_to_rq(cmnd)->tag);
return SUCCESS; return SUCCESS;
} else { } else {
csio_info(hw, csio_info(hw,
"Failed to abort SCSI command, (%d:%llu) tag %u\n", "Failed to abort SCSI command, (%d:%llu) tag %u\n",
cmnd->device->id, cmnd->device->lun, cmnd->device->id, cmnd->device->lun,
cmnd->request->tag); scsi_cmd_to_rq(cmnd)->tag);
return FAILED; return FAILED;
} }
} }