8 files changed, 13 insertions, 14 deletions

diff --git a/block/bsg.c b/block/bsg.c
index c85d961ee41e..0427ece9b6d8 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -900,7 +900,7 @@ bsg_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         case SG_EMULATED_HOST:
         case SCSI_IOCTL_SEND_COMMAND: {
                 void __user *uarg = (void __user *) arg;
-                return scsi_cmd_ioctl(file, bd->disk, cmd, uarg);
+                return scsi_cmd_ioctl(file, bd->queue, bd->disk, cmd, uarg);
         }
         case SG_IO: {
                 struct request *rq;
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index db53b2c268d3..a26ba07955fe 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -548,16 +548,12 @@ static inline int blk_send_start_stop(request_queue_t *q, struct gendisk *bd_dis
         return __blk_send_generic(q, bd_disk, GPCMD_START_STOP_UNIT, data);
 }
 
-int scsi_cmd_ioctl(struct file *file, struct gendisk *bd_disk, unsigned int cmd, void __user *arg)
+int scsi_cmd_ioctl(struct file *file, struct request_queue *q,
+                   struct gendisk *bd_disk, unsigned int cmd, void __user *arg)
 {
-        request_queue_t *q;
         int err;
 
-        q = bd_disk->queue;
-        if (!q)
-                return -ENXIO;
-
-        if (blk_get_queue(q))
+        if (!q || blk_get_queue(q))
                 return -ENXIO;
 
         switch (cmd) {
diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 18c8b6c0db20..8b13d7d2cb63 100644
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -1709,7 +1709,7 @@ static int ub_bd_ioctl(struct inode *inode, struct file *filp,
         struct gendisk *disk = inode->i_bdev->bd_disk;
         void __user *usermem = (void __user *) arg;
 
-        return scsi_cmd_ioctl(filp, disk, cmd, usermem);
+        return scsi_cmd_ioctl(filp, disk->queue, disk, cmd, usermem);
 }
 
 /*
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index aa5468f487ba..499019bf8f40 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -2695,11 +2695,12 @@ int cdrom_ioctl(struct file * file, struct cdrom_device_info *cdi,
 {
         void __user *argp = (void __user *)arg;
         int ret;
+        struct gendisk *disk = ip->i_bdev->bd_disk;
 
         /*
          * Try the generic SCSI command ioctl's first.
          */
-        ret = scsi_cmd_ioctl(file, ip->i_bdev->bd_disk, cmd, argp);
+        ret = scsi_cmd_ioctl(file, disk->queue, disk, cmd, argp);
         if (ret != -ENOTTY)
                 return ret;
 
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 9ae60a7400a2..8cd7694593c9 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1052,7 +1052,7 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
         int err, (*setfunc)(ide_drive_t *, int);
         u8 *val;
 
-        err = scsi_cmd_ioctl(file, bdev->bd_disk, cmd, p);
+        err = scsi_cmd_ioctl(file, bdev->bd_disk->queue, bdev->bd_disk, cmd, p);
         if (err != -ENOTTY)
                 return err;
 
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 448d316f12d7..424d557284a9 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -684,7 +684,7 @@ static int sd_ioctl(struct inode * inode, struct file * filp,
                 case SCSI_IOCTL_GET_BUS_NUMBER:
                         return scsi_ioctl(sdp, cmd, p);
                 default:
-                        error = scsi_cmd_ioctl(filp, disk, cmd, p);
+                        error = scsi_cmd_ioctl(filp, disk->queue, disk, cmd, p);
                         if (error != -ENOTTY)
                                 return error;
         }
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 55bfeccf68a2..a4f7b8465773 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -3549,7 +3549,8 @@ static int st_ioctl(struct inode *inode, struct file *file,
                             !capable(CAP_SYS_RAWIO))
                                 i = -EPERM;
                         else
-                                i = scsi_cmd_ioctl(file, STp->disk, cmd_in, p);
+                                i = scsi_cmd_ioctl(file, STp->disk->queue,
+                                                   STp->disk, cmd_in, p);
                         if (i != -ENOTTY)
                                 return i;
                         break;
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index f6bc0d03ffad..2746632c2267 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -644,7 +644,8 @@ extern void blk_requeue_request(request_queue_t *, struct request *);
 extern void blk_plug_device(request_queue_t *);
 extern int blk_remove_plug(request_queue_t *);
 extern void blk_recount_segments(request_queue_t *, struct bio *);
-extern int scsi_cmd_ioctl(struct file *, struct gendisk *, unsigned int, void __user *);
+extern int scsi_cmd_ioctl(struct file *, struct request_queue *,
+                          struct gendisk *, unsigned int, void __user *);
 extern int sg_scsi_ioctl(struct file *, struct request_queue *,
                 struct gendisk *, struct scsi_ioctl_command __user *);