16 files changed, 144 insertions, 107 deletions

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index f90ea221f7f2..7c826ecbd276 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -93,6 +93,7 @@ int ide_queue_pc_tail(ide_drive_t *drive, struct gendisk *disk,
         int error;
 
         rq = blk_get_request(drive->queue, READ, __GFP_RECLAIM);
+        scsi_req_init(rq);
         rq->cmd_type = REQ_TYPE_DRV_PRIV;
         rq->special = (char *)pc;
 
@@ -103,9 +104,9 @@ int ide_queue_pc_tail(ide_drive_t *drive, struct gendisk *disk,
                         goto put_req;
         }
 
-        memcpy(rq->cmd, pc->c, 12);
+        memcpy(scsi_req(rq)->cmd, pc->c, 12);
         if (drive->media == ide_tape)
-                rq->cmd[13] = REQ_IDETAPE_PC1;
+                scsi_req(rq)->cmd[13] = REQ_IDETAPE_PC1;
         error = blk_execute_rq(drive->queue, disk, rq, 0);
 put_req:
         blk_put_request(rq);
@@ -171,7 +172,8 @@ EXPORT_SYMBOL_GPL(ide_create_request_sense_cmd);
 void ide_prep_sense(ide_drive_t *drive, struct request *rq)
 {
         struct request_sense *sense = &drive->sense_data;
-        struct request *sense_rq = &drive->sense_rq;
+        struct request *sense_rq = drive->sense_rq;
+        struct scsi_request *req = scsi_req(sense_rq);
         unsigned int cmd_len, sense_len;
         int err;
 
@@ -197,6 +199,7 @@ void ide_prep_sense(ide_drive_t *drive, struct request *rq)
         memset(sense, 0, sizeof(*sense));
 
         blk_rq_init(rq->q, sense_rq);
+        scsi_req_init(sense_rq);
 
         err = blk_rq_map_kern(drive->queue, sense_rq, sense, sense_len,
                               GFP_NOIO);
@@ -208,13 +211,13 @@ void ide_prep_sense(ide_drive_t *drive, struct request *rq)
         }
 
         sense_rq->rq_disk = rq->rq_disk;
-        sense_rq->cmd[0] = GPCMD_REQUEST_SENSE;
-        sense_rq->cmd[4] = cmd_len;
         sense_rq->cmd_type = REQ_TYPE_ATA_SENSE;
         sense_rq->rq_flags |= RQF_PREEMPT;
 
+        req->cmd[0] = GPCMD_REQUEST_SENSE;
+        req->cmd[4] = cmd_len;
         if (drive->media == ide_tape)
-                sense_rq->cmd[13] = REQ_IDETAPE_PC1;
+                req->cmd[13] = REQ_IDETAPE_PC1;
 
         drive->sense_rq_armed = true;
 }
@@ -229,12 +232,12 @@ int ide_queue_sense_rq(ide_drive_t *drive, void *special)
                 return -ENOMEM;
         }
 
-        drive->sense_rq.special = special;
+        drive->sense_rq->special = special;
         drive->sense_rq_armed = false;
 
         drive->hwif->rq = NULL;
 
-        elv_add_request(drive->queue, &drive->sense_rq, ELEVATOR_INSERT_FRONT);
+        elv_add_request(drive->queue, drive->sense_rq, ELEVATOR_INSERT_FRONT);
         return 0;
 }
 EXPORT_SYMBOL_GPL(ide_queue_sense_rq);
@@ -247,14 +250,14 @@ EXPORT_SYMBOL_GPL(ide_queue_sense_rq);
 void ide_retry_pc(ide_drive_t *drive)
 {
         struct request *failed_rq = drive->hwif->rq;
-        struct request *sense_rq = &drive->sense_rq;
+        struct request *sense_rq = drive->sense_rq;
         struct ide_atapi_pc *pc = &drive->request_sense_pc;
 
         (void)ide_read_error(drive);
 
         /* init pc from sense_rq */
         ide_init_pc(pc);
-        memcpy(pc->c, sense_rq->cmd, 12);
+        memcpy(pc->c, scsi_req(sense_rq)->cmd, 12);
 
         if (drive->media == ide_tape)
                 drive->atapi_flags |= IDE_AFLAG_IGNORE_DSC;
@@ -286,7 +289,7 @@ int ide_cd_expiry(ide_drive_t *drive)
          * commands/drives support that. Let ide_timer_expiry keep polling us
          * for these.
          */
-        switch (rq->cmd[0]) {
+        switch (scsi_req(rq)->cmd[0]) {
         case GPCMD_BLANK:
         case GPCMD_FORMAT_UNIT:
         case GPCMD_RESERVE_RZONE_TRACK:
@@ -297,7 +300,7 @@ int ide_cd_expiry(ide_drive_t *drive)
         default:
                 if (!(rq->rq_flags & RQF_QUIET))
                         printk(KERN_INFO PFX "cmd 0x%x timed out\n",
-                                         rq->cmd[0]);
+                                         scsi_req(rq)->cmd[0]);
                 wait = 0;
                 break;
         }
@@ -420,7 +423,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
                                                      ? "write" : "read");
                         pc->flags |= PC_FLAG_DMA_ERROR;
                 } else
-                        rq->resid_len = 0;
+                        scsi_req(rq)->resid_len = 0;
                 debug_log("%s: DMA finished\n", drive->name);
         }
 
@@ -436,7 +439,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
                 local_irq_enable_in_hardirq();
 
                 if (drive->media == ide_tape &&
-                    (stat & ATA_ERR) && rq->cmd[0] == REQUEST_SENSE)
+                    (stat & ATA_ERR) && scsi_req(rq)->cmd[0] == REQUEST_SENSE)
                         stat &= ~ATA_ERR;
 
                 if ((stat & ATA_ERR) || (pc->flags & PC_FLAG_DMA_ERROR)) {
@@ -446,7 +449,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
                         if (drive->media != ide_tape)
                                 pc->rq->errors++;
 
-                        if (rq->cmd[0] == REQUEST_SENSE) {
+                        if (scsi_req(rq)->cmd[0] == REQUEST_SENSE) {
                                 printk(KERN_ERR PFX "%s: I/O error in request "
                                                 "sense command\n", drive->name);
                                 return ide_do_reset(drive);
@@ -512,7 +515,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
         ide_pio_bytes(drive, cmd, write, done);
 
         /* Update transferred byte count */
-        rq->resid_len -= done;
+        scsi_req(rq)->resid_len -= done;
 
         bcount -= done;
 
@@ -520,7 +523,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
                 ide_pad_transfer(drive, write, bcount);
 
         debug_log("[cmd %x] transferred %d bytes, padded %d bytes, resid: %u\n",
-                  rq->cmd[0], done, bcount, rq->resid_len);
+                  rq->cmd[0], done, bcount, scsi_req(rq)->resid_len);
 
         /* And set the interrupt handler again */
         ide_set_handler(drive, ide_pc_intr, timeout);
@@ -603,7 +606,7 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)
 
         if (dev_is_idecd(drive)) {
                 /* ATAPI commands get padded out to 12 bytes minimum */
-                cmd_len = COMMAND_SIZE(rq->cmd[0]);
+                cmd_len = COMMAND_SIZE(scsi_req(rq)->cmd[0]);
                 if (cmd_len < ATAPI_MIN_CDB_BYTES)
                         cmd_len = ATAPI_MIN_CDB_BYTES;
 
@@ -650,7 +653,7 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)
 
         /* Send the actual packet */
         if ((drive->atapi_flags & IDE_AFLAG_ZIP_DRIVE) == 0)
-                hwif->tp_ops->output_data(drive, NULL, rq->cmd, cmd_len);
+                hwif->tp_ops->output_data(drive, NULL, scsi_req(rq)->cmd, cmd_len);
 
         /* Begin DMA, if necessary */
         if (dev_is_idecd(drive)) {
@@ -695,7 +698,7 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, struct ide_cmd *cmd)
                                                              bytes, 63 * 1024));
 
                 /* We haven't transferred any data yet */
-                rq->resid_len = bcount;
+                scsi_req(rq)->resid_len = bcount;
 
                 if (pc->flags & PC_FLAG_DMA_ERROR) {
                         pc->flags &= ~PC_FLAG_DMA_ERROR;
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 9cbd217bc0c9..6eb98725e194 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -121,7 +121,7 @@ static int cdrom_log_sense(ide_drive_t *drive, struct request *rq)
                  * don't log START_STOP unit with LoEj set, since we cannot
                  * reliably check if drive can auto-close
                  */
-                if (rq->cmd[0] == GPCMD_START_STOP_UNIT && sense->asc == 0x24)
+                if (scsi_req(rq)->cmd[0] == GPCMD_START_STOP_UNIT && sense->asc == 0x24)
                         break;
                 log = 1;
                 break;
@@ -163,7 +163,7 @@ static void cdrom_analyze_sense_data(ide_drive_t *drive,
          * toc has not been recorded yet, it will fail with 05/24/00 (which is a
          * confusing error)
          */
-        if (failed_command && failed_command->cmd[0] == GPCMD_READ_TOC_PMA_ATIP)
+        if (failed_command && scsi_req(failed_command)->cmd[0] == GPCMD_READ_TOC_PMA_ATIP)
                 if (sense->sense_key == 0x05 && sense->asc == 0x24)
                         return;
 
@@ -219,15 +219,12 @@ static void ide_cd_complete_failed_rq(ide_drive_t *drive, struct request *rq)
         void *sense = bio_data(rq->bio);
 
         if (failed) {
-                if (failed->sense) {
-                        /*
-                         * Sense is always read into drive->sense_data.
-                         * Copy back if the failed request has its
-                         * sense pointer set.
-                         */
-                        memcpy(failed->sense, sense, 18);
-                        failed->sense_len = rq->sense_len;
-                }
+                /*
+                 * Sense is always read into drive->sense_data, copy back to the
+                 * original request.
+                 */
+                memcpy(scsi_req(failed)->sense, sense, 18);
+                scsi_req(failed)->sense_len = scsi_req(rq)->sense_len;
                 cdrom_analyze_sense_data(drive, failed);
 
                 if (ide_end_rq(drive, failed, -EIO, blk_rq_bytes(failed)))
@@ -338,7 +335,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat)
                  *
                  * cdrom_log_sense() knows this!
                  */
-                if (rq->cmd[0] == GPCMD_START_STOP_UNIT)
+                if (scsi_req(rq)->cmd[0] == GPCMD_START_STOP_UNIT)
                         break;
                 /* fall-through */
         case DATA_PROTECT:
@@ -414,7 +411,7 @@ static void ide_cd_request_sense_fixup(ide_drive_t *drive, struct ide_cmd *cmd)
          * Some of the trailing request sense fields are optional,
          * and some drives don't send them.  Sigh.
          */
-        if (rq->cmd[0] == GPCMD_REQUEST_SENSE &&
+        if (scsi_req(rq)->cmd[0] == GPCMD_REQUEST_SENSE &&
             cmd->nleft > 0 && cmd->nleft <= 5)
                 cmd->nleft = 0;
 }
@@ -425,12 +422,8 @@ int ide_cd_queue_pc(ide_drive_t *drive, const unsigned char *cmd,
                     req_flags_t rq_flags)
 {
         struct cdrom_info *info = drive->driver_data;
-        struct request_sense local_sense;
         int retries = 10;
-        req_flags_t flags = 0;
-
-        if (!sense)
-                sense = &local_sense;
+        bool failed;
 
         ide_debug_log(IDE_DBG_PC, "cmd[0]: 0x%x, write: 0x%x, timeout: %d, "
                                   "rq_flags: 0x%x",
@@ -440,12 +433,12 @@ int ide_cd_queue_pc(ide_drive_t *drive, const unsigned char *cmd,
         do {
                 struct request *rq;
                 int error;
+                bool delay = false;
 
                 rq = blk_get_request(drive->queue, write, __GFP_RECLAIM);
-
-                memcpy(rq->cmd, cmd, BLK_MAX_CDB);
+                scsi_req_init(rq);
+                memcpy(scsi_req(rq)->cmd, cmd, BLK_MAX_CDB);
                 rq->cmd_type = REQ_TYPE_ATA_PC;
-                rq->sense = sense;
                 rq->rq_flags |= rq_flags;
                 rq->timeout = timeout;
                 if (buffer) {
@@ -460,21 +453,21 @@ int ide_cd_queue_pc(ide_drive_t *drive, const unsigned char *cmd,
                 error = blk_execute_rq(drive->queue, info->disk, rq, 0);
 
                 if (buffer)
-                        *bufflen = rq->resid_len;
-
-                flags = rq->rq_flags;
-                blk_put_request(rq);
+                        *bufflen = scsi_req(rq)->resid_len;
+                if (sense)
+                        memcpy(sense, scsi_req(rq)->sense, sizeof(*sense));
 
                 /*
                  * FIXME: we should probably abort/retry or something in case of
                  * failure.
                  */
-                if (flags & RQF_FAILED) {
+                failed = (rq->rq_flags & RQF_FAILED) != 0;
+                if (failed) {
                         /*
                          * The request failed.  Retry if it was due to a unit
                          * attention status (usually means media was changed).
                          */
-                        struct request_sense *reqbuf = sense;
+                        struct request_sense *reqbuf = scsi_req(rq)->sense;
 
                         if (reqbuf->sense_key == UNIT_ATTENTION)
                                 cdrom_saw_media_change(drive);
@@ -485,19 +478,20 @@ int ide_cd_queue_pc(ide_drive_t *drive, const unsigned char *cmd,
                                  * a disk.  Retry, but wait a little to give
                                  * the drive time to complete the load.
                                  */
-                                ssleep(2);
+                                delay = true;
                         } else {
                                 /* otherwise, don't retry */
                                 retries = 0;
                         }
                         --retries;
                 }
-
-                /* end of retry loop */
-        } while ((flags & RQF_FAILED) && retries >= 0);
+                blk_put_request(rq);
+                if (delay)
+                        ssleep(2);
+        } while (failed && retries >= 0);
 
         /* return an error if the command failed */
-        return (flags & RQF_FAILED) ? -EIO : 0;
+        return failed ? -EIO : 0;
 }
 
 /*
@@ -636,7 +630,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
                 len -= blen;
 
                 if (sense && write == 0)
-                        rq->sense_len += blen;
+                        scsi_req(rq)->sense_len += blen;
         }
 
         /* pad, if necessary */
@@ -664,7 +658,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
 
 out_end:
         if (rq->cmd_type == REQ_TYPE_BLOCK_PC && rc == 0) {
-                rq->resid_len = 0;
+                scsi_req(rq)->resid_len = 0;
                 blk_end_request_all(rq, 0);
                 hwif->rq = NULL;
         } else {
@@ -685,9 +679,9 @@ out_end:
 
                 /* make sure it's fully ended */
                 if (rq->cmd_type != REQ_TYPE_FS) {
-                        rq->resid_len -= cmd->nbytes - cmd->nleft;
+                        scsi_req(rq)->resid_len -= cmd->nbytes - cmd->nleft;
                         if (uptodate == 0 && (cmd->tf_flags & IDE_TFLAG_WRITE))
-                                rq->resid_len += cmd->last_xfer_len;
+                                scsi_req(rq)->resid_len += cmd->last_xfer_len;
                 }
 
                 ide_complete_rq(drive, uptodate ? 0 : -EIO, blk_rq_bytes(rq));
@@ -1312,28 +1306,29 @@ static int ide_cdrom_prep_fs(struct request_queue *q, struct request *rq)
         int hard_sect = queue_logical_block_size(q);
         long block = (long)blk_rq_pos(rq) / (hard_sect >> 9);
         unsigned long blocks = blk_rq_sectors(rq) / (hard_sect >> 9);
+        struct scsi_request *req = scsi_req(rq);
 
-        memset(rq->cmd, 0, BLK_MAX_CDB);
+        memset(req->cmd, 0, BLK_MAX_CDB);
 
         if (rq_data_dir(rq) == READ)
-                rq->cmd[0] = GPCMD_READ_10;
+                req->cmd[0] = GPCMD_READ_10;
         else
-                rq->cmd[0] = GPCMD_WRITE_10;
+                req->cmd[0] = GPCMD_WRITE_10;
 
         /*
          * fill in lba
          */
-        rq->cmd[2] = (block >> 24) & 0xff;
-        rq->cmd[3] = (block >> 16) & 0xff;
-        rq->cmd[4] = (block >>  8) & 0xff;
-        rq->cmd[5] = block & 0xff;
+        req->cmd[2] = (block >> 24) & 0xff;
+        req->cmd[3] = (block >> 16) & 0xff;
+        req->cmd[4] = (block >>  8) & 0xff;
+        req->cmd[5] = block & 0xff;
 
         /*
          * and transfer length
          */
-        rq->cmd[7] = (blocks >> 8) & 0xff;
-        rq->cmd[8] = blocks & 0xff;
-        rq->cmd_len = 10;
+        req->cmd[7] = (blocks >> 8) & 0xff;
+        req->cmd[8] = blocks & 0xff;
+        req->cmd_len = 10;
         return BLKPREP_OK;
 }
 
@@ -1343,7 +1338,7 @@ static int ide_cdrom_prep_fs(struct request_queue *q, struct request *rq)
  */
 static int ide_cdrom_prep_pc(struct request *rq)
 {
-        u8 *c = rq->cmd;
+        u8 *c = scsi_req(rq)->cmd;
 
         /* transform 6-byte read/write commands to the 10-byte version */
         if (c[0] == READ_6 || c[0] == WRITE_6) {
@@ -1354,7 +1349,7 @@ static int ide_cdrom_prep_pc(struct request *rq)
                 c[2] = 0;
                 c[1] &= 0xe0;
                 c[0] += (READ_10 - READ_6);
-                rq->cmd_len = 10;
+                scsi_req(rq)->cmd_len = 10;
                 return BLKPREP_OK;
         }
 
diff --git a/drivers/ide/ide-cd_ioctl.c b/drivers/ide/ide-cd_ioctl.c
index f085e3a2e1d6..da0aa0153fb1 100644
--- a/drivers/ide/ide-cd_ioctl.c
+++ b/drivers/ide/ide-cd_ioctl.c
@@ -304,6 +304,7 @@ int ide_cdrom_reset(struct cdrom_device_info *cdi)
         int ret;
 
         rq = blk_get_request(drive->queue, READ, __GFP_RECLAIM);
+        scsi_req_init(rq);
         rq->cmd_type = REQ_TYPE_DRV_PRIV;
         rq->rq_flags = RQF_QUIET;
         ret = blk_execute_rq(drive->queue, cd->disk, rq, 0);
diff --git a/drivers/ide/ide-cd_verbose.c b/drivers/ide/ide-cd_verbose.c
index f079ca2f260b..58a6feb74c02 100644
--- a/drivers/ide/ide-cd_verbose.c
+++ b/drivers/ide/ide-cd_verbose.c
@@ -315,12 +315,12 @@ void ide_cd_log_error(const char *name, struct request *failed_command,
                 while (hi > lo) {
                         mid = (lo + hi) / 2;
                         if (packet_command_texts[mid].packet_command ==
-                            failed_command->cmd[0]) {
+                            scsi_req(failed_command)->cmd[0]) {
                                 s = packet_command_texts[mid].text;
                                 break;
                         }
                         if (packet_command_texts[mid].packet_command >
-                            failed_command->cmd[0])
+                            scsi_req(failed_command)->cmd[0])
                                 hi = mid;
                         else
                                 lo = mid + 1;
@@ -329,7 +329,7 @@ void ide_cd_log_error(const char *name, struct request *failed_command,
                 printk(KERN_ERR "  The failed \"%s\" packet command "
                                 "was: \n  \"", s);
                 for (i = 0; i < BLK_MAX_CDB; i++)
-                        printk(KERN_CONT "%02x ", failed_command->cmd[i]);
+                        printk(KERN_CONT "%02x ", scsi_req(failed_command)->cmd[i]);
                 printk(KERN_CONT "\"\n");
         }
 
diff --git a/drivers/ide/ide-devsets.c b/drivers/ide/ide-devsets.c
index 0dd43b4fcec6..fd56c9dd9bc7 100644
--- a/drivers/ide/ide-devsets.c
+++ b/drivers/ide/ide-devsets.c
@@ -166,10 +166,11 @@ int ide_devset_execute(ide_drive_t *drive, const struct ide_devset *setting,
                 return setting->set(drive, arg);
 
         rq = blk_get_request(q, READ, __GFP_RECLAIM);
+        scsi_req_init(rq);
         rq->cmd_type = REQ_TYPE_DRV_PRIV;
-        rq->cmd_len = 5;
-        rq->cmd[0] = REQ_DEVSET_EXEC;
-        *(int *)&rq->cmd[1] = arg;
+        scsi_req(rq)->cmd_len = 5;
+        scsi_req(rq)->cmd[0] = REQ_DEVSET_EXEC;
+        *(int *)&scsi_req(rq)->cmd[1] = arg;
         rq->special = setting->set;
 
         if (blk_execute_rq(q, NULL, rq, 0))
@@ -183,7 +184,7 @@ ide_startstop_t ide_do_devset(ide_drive_t *drive, struct request *rq)
 {
         int err, (*setfunc)(ide_drive_t *, int) = rq->special;
 
-        err = setfunc(drive, *(int *)&rq->cmd[1]);
+        err = setfunc(drive, *(int *)&scsi_req(rq)->cmd[1]);
         if (err)
                 rq->errors = err;
         ide_complete_rq(drive, err, blk_rq_bytes(rq));
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 5ceace542b77..3437c5b28599 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -478,6 +478,7 @@ static int set_multcount(ide_drive_t *drive, int arg)
                 return -EBUSY;
 
         rq = blk_get_request(drive->queue, READ, __GFP_RECLAIM);
+        scsi_req_init(rq);
         rq->cmd_type = REQ_TYPE_ATA_TASKFILE;
 
         drive->mult_req = arg;
diff --git a/drivers/ide/ide-eh.c b/drivers/ide/ide-eh.c
index d6da011299f5..35e5b892f9d7 100644
--- a/drivers/ide/ide-eh.c
+++ b/drivers/ide/ide-eh.c
@@ -148,7 +148,7 @@ static inline void ide_complete_drive_reset(ide_drive_t *drive, int err)
         struct request *rq = drive->hwif->rq;
 
         if (rq && rq->cmd_type == REQ_TYPE_DRV_PRIV &&
-            rq->cmd[0] == REQ_DRIVE_RESET) {
+            scsi_req(rq)->cmd[0] == REQ_DRIVE_RESET) {
                 if (err <= 0 && rq->errors == 0)
                         rq->errors = -EIO;
                 ide_complete_rq(drive, err ? err : 0, blk_rq_bytes(rq));
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index f079d8d1d856..3bd678ad3519 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -203,7 +203,7 @@ static void idefloppy_create_rw_cmd(ide_drive_t *drive,
         put_unaligned(cpu_to_be16(blocks), (unsigned short *)&pc->c[7]);
         put_unaligned(cpu_to_be32(block), (unsigned int *) &pc->c[2]);
 
-        memcpy(rq->cmd, pc->c, 12);
+        memcpy(scsi_req(rq)->cmd, pc->c, 12);
 
         pc->rq = rq;
         if (cmd == WRITE)
@@ -216,7 +216,7 @@ static void idefloppy_blockpc_cmd(struct ide_disk_obj *floppy,
                 struct ide_atapi_pc *pc, struct request *rq)
 {
         ide_init_pc(pc);
-        memcpy(pc->c, rq->cmd, sizeof(pc->c));
+        memcpy(pc->c, scsi_req(rq)->cmd, sizeof(pc->c));
         pc->rq = rq;
         if (blk_rq_bytes(rq)) {
                 pc->flags |= PC_FLAG_DMA_OK;
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 201e43fcbc94..3378503afed4 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -279,7 +279,7 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive,
 
 static ide_startstop_t ide_special_rq(ide_drive_t *drive, struct request *rq)
 {
-        u8 cmd = rq->cmd[0];
+        u8 cmd = scsi_req(rq)->cmd[0];
 
         switch (cmd) {
         case REQ_PARK_HEADS:
@@ -545,6 +545,7 @@ repeat:
                         goto plug_device;
                 }
 
+                scsi_req(rq)->resid_len = blk_rq_bytes(rq);
                 hwif->rq = rq;
 
                 spin_unlock_irq(&hwif->lock);
diff --git a/drivers/ide/ide-ioctls.c b/drivers/ide/ide-ioctls.c
index d05db2469209..a5d22c6e956a 100644
--- a/drivers/ide/ide-ioctls.c
+++ b/drivers/ide/ide-ioctls.c
@@ -126,6 +126,7 @@ static int ide_cmd_ioctl(ide_drive_t *drive, unsigned long arg)
                 struct request *rq;
 
                 rq = blk_get_request(drive->queue, READ, __GFP_RECLAIM);
+                scsi_req_init(rq);
                 rq->cmd_type = REQ_TYPE_ATA_TASKFILE;
                 err = blk_execute_rq(drive->queue, NULL, rq, 0);
                 blk_put_request(rq);
@@ -222,9 +223,10 @@ static int generic_drive_reset(ide_drive_t *drive)
         int ret = 0;
 
         rq = blk_get_request(drive->queue, READ, __GFP_RECLAIM);
+        scsi_req_init(rq);
         rq->cmd_type = REQ_TYPE_DRV_PRIV;
-        rq->cmd_len = 1;
-        rq->cmd[0] = REQ_DRIVE_RESET;
+        scsi_req(rq)->cmd_len = 1;
+        scsi_req(rq)->cmd[0] = REQ_DRIVE_RESET;
         if (blk_execute_rq(drive->queue, NULL, rq, 1))
                 ret = rq->errors;
         blk_put_request(rq);
diff --git a/drivers/ide/ide-park.c b/drivers/ide/ide-park.c
index 2d7dca56dd24..c37604a75097 100644
--- a/drivers/ide/ide-park.c
+++ b/drivers/ide/ide-park.c
@@ -32,8 +32,9 @@ static void issue_park_cmd(ide_drive_t *drive, unsigned long timeout)
         spin_unlock_irq(&hwif->lock);
 
         rq = blk_get_request(q, READ, __GFP_RECLAIM);
-        rq->cmd[0] = REQ_PARK_HEADS;
-        rq->cmd_len = 1;
+        scsi_req_init(rq);
+        scsi_req(rq)->cmd[0] = REQ_PARK_HEADS;
+        scsi_req(rq)->cmd_len = 1;
         rq->cmd_type = REQ_TYPE_DRV_PRIV;
         rq->special = &timeout;
         rc = blk_execute_rq(q, NULL, rq, 1);
@@ -46,11 +47,12 @@ static void issue_park_cmd(ide_drive_t *drive, unsigned long timeout)
          * timeout has expired, so power management will be reenabled.
          */
         rq = blk_get_request(q, READ, GFP_NOWAIT);
+        scsi_req_init(rq);
         if (IS_ERR(rq))
                 goto out;
 
-        rq->cmd[0] = REQ_UNPARK_HEADS;
-        rq->cmd_len = 1;
+        scsi_req(rq)->cmd[0] = REQ_UNPARK_HEADS;
+        scsi_req(rq)->cmd_len = 1;
         rq->cmd_type = REQ_TYPE_DRV_PRIV;
         elv_add_request(q, rq, ELEVATOR_INSERT_FRONT);
 
@@ -64,7 +66,7 @@ ide_startstop_t ide_do_park_unpark(ide_drive_t *drive, struct request *rq)
         struct ide_taskfile *tf = &cmd.tf;
 
         memset(&cmd, 0, sizeof(cmd));
-        if (rq->cmd[0] == REQ_PARK_HEADS) {
+        if (scsi_req(rq)->cmd[0] == REQ_PARK_HEADS) {
                 drive->sleep = *(unsigned long *)rq->special;
                 drive->dev_flags |= IDE_DFLAG_SLEEPING;
                 tf->command = ATA_CMD_IDLEIMMEDIATE;
diff --git a/drivers/ide/ide-pm.c b/drivers/ide/ide-pm.c
index a015acdffb39..f6767aba7cfb 100644
--- a/drivers/ide/ide-pm.c
+++ b/drivers/ide/ide-pm.c
@@ -19,6 +19,7 @@ int generic_ide_suspend(struct device *dev, pm_message_t mesg)
 
         memset(&rqpm, 0, sizeof(rqpm));
         rq = blk_get_request(drive->queue, READ, __GFP_RECLAIM);
+        scsi_req_init(rq);
         rq->cmd_type = REQ_TYPE_ATA_PM_SUSPEND;
         rq->special = &rqpm;
         rqpm.pm_step = IDE_PM_START_SUSPEND;
@@ -89,6 +90,7 @@ int generic_ide_resume(struct device *dev)
 
         memset(&rqpm, 0, sizeof(rqpm));
         rq = blk_get_request(drive->queue, READ, __GFP_RECLAIM);
+        scsi_req_init(rq);
         rq->cmd_type = REQ_TYPE_ATA_PM_RESUME;
         rq->rq_flags |= RQF_PREEMPT;
         rq->special = &rqpm;
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 330e319419e6..a74ae8df4bb8 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -741,6 +741,14 @@ static void ide_port_tune_devices(ide_hwif_t *hwif)
         }
 }
 
+static int ide_init_rq(struct request_queue *q, struct request *rq, gfp_t gfp)
+{
+        struct ide_request *req = blk_mq_rq_to_pdu(rq);
+
+        req->sreq.sense = req->sense;
+        return 0;
+}
+
 /*
  * init request queue
  */
@@ -758,11 +766,18 @@ static int ide_init_queue(ide_drive_t *drive)
          *      limits and LBA48 we could raise it but as yet
          *      do not.
          */
-
-        q = blk_init_queue_node(do_ide_request, NULL, hwif_to_node(hwif));
+        q = blk_alloc_queue_node(GFP_KERNEL, hwif_to_node(hwif));
         if (!q)
                 return 1;
 
+        q->request_fn = do_ide_request;
+        q->init_rq_fn = ide_init_rq;
+        q->cmd_size = sizeof(struct ide_request);
+        if (blk_init_allocated_queue(q) < 0) {
+                blk_cleanup_queue(q);
+                return 1;
+        }
+
         q->queuedata = drive;
         blk_queue_segment_boundary(q, 0xffff);
 
@@ -1131,10 +1146,12 @@ static void ide_port_init_devices_data(ide_hwif_t *hwif)
         ide_port_for_each_dev(i, drive, hwif) {
                 u8 j = (hwif->index * MAX_DRIVES) + i;
                 u16 *saved_id = drive->id;
+                struct request *saved_sense_rq = drive->sense_rq;
 
                 memset(drive, 0, sizeof(*drive));
                 memset(saved_id, 0, SECTOR_SIZE);
                 drive->id = saved_id;
+                drive->sense_rq = saved_sense_rq;
 
                 drive->media                    = ide_disk;
                 drive->select                   = (i << 4) | ATA_DEVICE_OBS;
@@ -1241,6 +1258,7 @@ static void ide_port_free_devices(ide_hwif_t *hwif)
         int i;
 
         ide_port_for_each_dev(i, drive, hwif) {
+                kfree(drive->sense_rq);
                 kfree(drive->id);
                 kfree(drive);
         }
@@ -1248,11 +1266,10 @@ static void ide_port_free_devices(ide_hwif_t *hwif)
 
 static int ide_port_alloc_devices(ide_hwif_t *hwif, int node)
 {
+        ide_drive_t *drive;
         int i;
 
         for (i = 0; i < MAX_DRIVES; i++) {
-                ide_drive_t *drive;
-
                 drive = kzalloc_node(sizeof(*drive), GFP_KERNEL, node);
                 if (drive == NULL)
                         goto out_nomem;
@@ -1267,12 +1284,21 @@ static int ide_port_alloc_devices(ide_hwif_t *hwif, int node)
                  */
                 drive->id = kzalloc_node(SECTOR_SIZE, GFP_KERNEL, node);
                 if (drive->id == NULL)
-                        goto out_nomem;
+                        goto out_free_drive;
+
+                drive->sense_rq = kmalloc(sizeof(struct request) +
+                                sizeof(struct ide_request), GFP_KERNEL);
+                if (!drive->sense_rq)
+                        goto out_free_id;
 
                 hwif->devices[i] = drive;
         }
         return 0;
 
+out_free_id:
+        kfree(drive->id);
+out_free_drive:
+        kfree(drive);
 out_nomem:
         ide_port_free_devices(hwif);
         return -ENOMEM;
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 9ecf4e35adcd..f6bc1e2bb035 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -282,7 +282,7 @@ static void idetape_analyze_error(ide_drive_t *drive)
 
         /* correct remaining bytes to transfer */
         if (pc->flags & PC_FLAG_DMA_ERROR)
-                rq->resid_len = tape->blk_size * get_unaligned_be32(&sense[3]);
+                scsi_req(rq)->resid_len = tape->blk_size * get_unaligned_be32(&sense[3]);
 
         /*
          * If error was the result of a zero-length read or write command,
@@ -316,7 +316,7 @@ static void idetape_analyze_error(ide_drive_t *drive)
                         pc->flags |= PC_FLAG_ABORT;
                 }
                 if (!(pc->flags & PC_FLAG_ABORT) &&
-                    (blk_rq_bytes(rq) - rq->resid_len))
+                    (blk_rq_bytes(rq) - scsi_req(rq)->resid_len))
                         pc->retries = IDETAPE_MAX_PC_RETRIES + 1;
         }
 }
@@ -348,7 +348,7 @@ static int ide_tape_callback(ide_drive_t *drive, int dsc)
                                         "itself - Aborting request!\n");
         } else if (pc->c[0] == READ_6 || pc->c[0] == WRITE_6) {
                 unsigned int blocks =
-                        (blk_rq_bytes(rq) - rq->resid_len) / tape->blk_size;
+                        (blk_rq_bytes(rq) - scsi_req(rq)->resid_len) / tape->blk_size;
 
                 tape->avg_size += blocks * tape->blk_size;
 
@@ -560,7 +560,7 @@ static void ide_tape_create_rw_cmd(idetape_tape_t *tape,
                 pc->flags |= PC_FLAG_WRITING;
         }
 
-        memcpy(rq->cmd, pc->c, 12);
+        memcpy(scsi_req(rq)->cmd, pc->c, 12);
 }
 
 static ide_startstop_t idetape_do_request(ide_drive_t *drive,
@@ -570,10 +570,11 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
         idetape_tape_t *tape = drive->driver_data;
         struct ide_atapi_pc *pc = NULL;
         struct ide_cmd cmd;
+        struct scsi_request *req = scsi_req(rq);
         u8 stat;
 
         ide_debug_log(IDE_DBG_RQ, "cmd: 0x%x, sector: %llu, nr_sectors: %u",
-                      rq->cmd[0], (unsigned long long)blk_rq_pos(rq),
+                      req->cmd[0], (unsigned long long)blk_rq_pos(rq),
                       blk_rq_sectors(rq));
 
         BUG_ON(!(rq->cmd_type == REQ_TYPE_DRV_PRIV ||
@@ -592,7 +593,7 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
         stat = hwif->tp_ops->read_status(hwif);
 
         if ((drive->dev_flags & IDE_DFLAG_DSC_OVERLAP) == 0 &&
-            (rq->cmd[13] & REQ_IDETAPE_PC2) == 0)
+            (req->cmd[13] & REQ_IDETAPE_PC2) == 0)
                 drive->atapi_flags |= IDE_AFLAG_IGNORE_DSC;
 
         if (drive->dev_flags & IDE_DFLAG_POST_RESET) {
@@ -609,7 +610,7 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
                 } else if (time_after(jiffies, tape->dsc_timeout)) {
                         printk(KERN_ERR "ide-tape: %s: DSC timeout\n",
                                 tape->name);
-                        if (rq->cmd[13] & REQ_IDETAPE_PC2) {
+                        if (req->cmd[13] & REQ_IDETAPE_PC2) {
                                 idetape_media_access_finished(drive);
                                 return ide_stopped;
                         } else {
@@ -626,23 +627,23 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
                 tape->postponed_rq = false;
         }
 
-        if (rq->cmd[13] & REQ_IDETAPE_READ) {
+        if (req->cmd[13] & REQ_IDETAPE_READ) {
                 pc = &tape->queued_pc;
                 ide_tape_create_rw_cmd(tape, pc, rq, READ_6);
                 goto out;
         }
-        if (rq->cmd[13] & REQ_IDETAPE_WRITE) {
+        if (req->cmd[13] & REQ_IDETAPE_WRITE) {
                 pc = &tape->queued_pc;
                 ide_tape_create_rw_cmd(tape, pc, rq, WRITE_6);
                 goto out;
         }
-        if (rq->cmd[13] & REQ_IDETAPE_PC1) {
+        if (req->cmd[13] & REQ_IDETAPE_PC1) {
                 pc = (struct ide_atapi_pc *)rq->special;
-                rq->cmd[13] &= ~(REQ_IDETAPE_PC1);
-                rq->cmd[13] |= REQ_IDETAPE_PC2;
+                req->cmd[13] &= ~(REQ_IDETAPE_PC1);
+                req->cmd[13] |= REQ_IDETAPE_PC2;
                 goto out;
         }
-        if (rq->cmd[13] & REQ_IDETAPE_PC2) {
+        if (req->cmd[13] & REQ_IDETAPE_PC2) {
                 idetape_media_access_finished(drive);
                 return ide_stopped;
         }
@@ -853,8 +854,9 @@ static int idetape_queue_rw_tail(ide_drive_t *drive, int cmd, int size)
         BUG_ON(size < 0 || size % tape->blk_size);
 
         rq = blk_get_request(drive->queue, READ, __GFP_RECLAIM);
+        scsi_req_init(rq);
         rq->cmd_type = REQ_TYPE_DRV_PRIV;
-        rq->cmd[13] = cmd;
+        scsi_req(rq)->cmd[13] = cmd;
         rq->rq_disk = tape->disk;
         rq->__sector = tape->first_frame;
 
@@ -868,7 +870,7 @@ static int idetape_queue_rw_tail(ide_drive_t *drive, int cmd, int size)
         blk_execute_rq(drive->queue, tape->disk, rq, 0);
 
         /* calculate the number of transferred bytes and update buffer state */
-        size -= rq->resid_len;
+        size -= scsi_req(rq)->resid_len;
         tape->cur = tape->buf;
         if (cmd == REQ_IDETAPE_READ)
                 tape->valid = size;
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index a716693417a3..a393e13b8007 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -431,6 +431,7 @@ int ide_raw_taskfile(ide_drive_t *drive, struct ide_cmd *cmd, u8 *buf,
         int rw = !(cmd->tf_flags & IDE_TFLAG_WRITE) ? READ : WRITE;
 
         rq = blk_get_request(drive->queue, rw, __GFP_RECLAIM);
+        scsi_req_init(rq);
         rq->cmd_type = REQ_TYPE_ATA_TASKFILE;
 
         /*
diff --git a/drivers/ide/sis5513.c b/drivers/ide/sis5513.c
index 247853ea1368..c3062b53056f 100644
--- a/drivers/ide/sis5513.c
+++ b/drivers/ide/sis5513.c
@@ -54,7 +54,7 @@
 #define DRV_NAME "sis5513"
 
 /* registers layout and init values are chipset family dependent */
-
+#undef ATA_16
 #define ATA_16          0x01
 #define ATA_33          0x02
 #define ATA_66          0x03