OSDN Git Service

scsi: usb-storage: Use scsi_cmd_to_rq() instead of scsi_cmnd.request
authorBart Van Assche <bvanassche@acm.org>
Mon, 9 Aug 2021 23:03:54 +0000 (16:03 -0700)
committerMartin K. Petersen <martin.petersen@oracle.com>
Thu, 12 Aug 2021 02:25:42 +0000 (22:25 -0400)
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-52-bvanassche@acm.org
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/usb/storage/transport.c

index f4304ce..4c5a0a4 100644 (file)
@@ -551,7 +551,7 @@ static void last_sector_hacks(struct us_data *us, struct scsi_cmnd *srb)
        /* Did this command access the last sector? */
        sector = (srb->cmnd[2] << 24) | (srb->cmnd[3] << 16) |
                        (srb->cmnd[4] << 8) | (srb->cmnd[5]);
-       disk = srb->request->rq_disk;
+       disk = scsi_cmd_to_rq(srb)->rq_disk;
        if (!disk)
                goto done;
        sdkp = scsi_disk(disk);