5 files changed, 7 insertions, 5 deletions

diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 18c8b6c0db2..8b13d7d2cb6 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 aa5468f487b..499019bf8f4 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 9ae60a7400a..8cd7694593c 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 448d316f12d..424d557284a 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 55bfeccf68a..a4f7b846577 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;