Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[platform/kernel/linux-starfive.git] / drivers / scsi / sr.c

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 641552d..5ba9df3 100644 (file)
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -926,7 +926,7 @@ static int sr_read_cdda_bpc(struct cdrom_device_info *cdi, void __user *ubuf,
 {
        struct gendisk *disk = cdi->disk;
        u32 len = nr * CD_FRAMESIZE_RAW;
-       struct scsi_request *req;
+       struct scsi_cmnd *scmd;
        struct request *rq;
        struct bio *bio;
        int ret;
@@ -934,31 +934,31 @@ static int sr_read_cdda_bpc(struct cdrom_device_info *cdi, void __user *ubuf,
        rq = scsi_alloc_request(disk->queue, REQ_OP_DRV_IN, 0);
        if (IS_ERR(rq))
                return PTR_ERR(rq);
-       req = scsi_req(rq);
+       scmd = blk_mq_rq_to_pdu(rq);
 
        ret = blk_rq_map_user(disk->queue, rq, NULL, ubuf, len, GFP_KERNEL);
        if (ret)
                goto out_put_request;
 
-       req->cmd[0] = GPCMD_READ_CD;
-       req->cmd[1] = 1 << 2;
-       req->cmd[2] = (lba >> 24) & 0xff;
-       req->cmd[3] = (lba >> 16) & 0xff;
-       req->cmd[4] = (lba >>  8) & 0xff;
-       req->cmd[5] = lba & 0xff;
-       req->cmd[6] = (nr >> 16) & 0xff;
-       req->cmd[7] = (nr >>  8) & 0xff;
-       req->cmd[8] = nr & 0xff;
-       req->cmd[9] = 0xf8;
-       req->cmd_len = 12;
+       scmd->cmnd[0] = GPCMD_READ_CD;
+       scmd->cmnd[1] = 1 << 2;
+       scmd->cmnd[2] = (lba >> 24) & 0xff;
+       scmd->cmnd[3] = (lba >> 16) & 0xff;
+       scmd->cmnd[4] = (lba >>  8) & 0xff;
+       scmd->cmnd[5] = lba & 0xff;
+       scmd->cmnd[6] = (nr >> 16) & 0xff;
+       scmd->cmnd[7] = (nr >>  8) & 0xff;
+       scmd->cmnd[8] = nr & 0xff;
+       scmd->cmnd[9] = 0xf8;
+       scmd->cmd_len = 12;
        rq->timeout = 60 * HZ;
        bio = rq->bio;
 
        blk_execute_rq(rq, false);
-       if (scsi_req(rq)->result) {
+       if (scmd->result) {
                struct scsi_sense_hdr sshdr;
 
-               scsi_normalize_sense(req->sense, req->sense_len,
+               scsi_normalize_sense(scmd->sense_buffer, scmd->sense_len,
                                     &sshdr);
                *last_sense = sshdr.sense_key;
                ret = -EIO;