1 files changed, 2 insertions, 56 deletions

diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 9a87daa6f4f..4f4230b79bb 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -24,7 +24,6 @@
 #include <linux/capability.h>
 #include <linux/completion.h>
 #include <linux/cdrom.h>
-#include <linux/ratelimit.h>
 #include <linux/slab.h>
 #include <linux/times.h>
 #include <asm/uaccess.h>
@@ -566,7 +565,7 @@ int scsi_cmd_ioctl(struct request_queue *q, struct gendisk *bd_disk, fmode_t mod
 {
         int err;
 
-        if (!q)
+        if (!q || blk_get_queue(q))
                 return -ENXIO;
 
         switch (cmd) {
@@ -687,64 +686,11 @@ int scsi_cmd_ioctl(struct request_queue *q, struct gendisk *bd_disk, fmode_t mod
                         err = -ENOTTY;
         }
 
+        blk_put_queue(q);
         return err;
 }
 EXPORT_SYMBOL(scsi_cmd_ioctl);
 
-int scsi_verify_blk_ioctl(struct block_device *bd, unsigned int cmd)
-{
-        if (bd && bd == bd->bd_contains)
-                return 0;
-
-        /* Actually none of these is particularly useful on a partition,
-         * but they are safe.
-         */
-        switch (cmd) {
-        case SCSI_IOCTL_GET_IDLUN:
-        case SCSI_IOCTL_GET_BUS_NUMBER:
-        case SCSI_IOCTL_GET_PCI:
-        case SCSI_IOCTL_PROBE_HOST:
-        case SG_GET_VERSION_NUM:
-        case SG_SET_TIMEOUT:
-        case SG_GET_TIMEOUT:
-        case SG_GET_RESERVED_SIZE:
-        case SG_SET_RESERVED_SIZE:
-        case SG_EMULATED_HOST:
-                return 0;
-        case CDROM_GET_CAPABILITY:
-                /* Keep this until we remove the printk below.  udev sends it
-                 * and we do not want to spam dmesg about it.   CD-ROMs do
-                 * not have partitions, so we get here only for disks.
-                 */
-                return -ENOIOCTLCMD;
-        default:
-                break;
-        }
-
-        if (capable(CAP_SYS_RAWIO))
-                return 0;
-
-        /* In particular, rule out all resets and host-specific ioctls.  */
-        printk_ratelimited(KERN_WARNING
-                           "%s: sending ioctl %x to a partition!\n", current->comm, cmd);
-
-        return -ENOIOCTLCMD;
-}
-EXPORT_SYMBOL(scsi_verify_blk_ioctl);
-
-int scsi_cmd_blk_ioctl(struct block_device *bd, fmode_t mode,
-                       unsigned int cmd, void __user *arg)
-{
-        int ret;
-
-        ret = scsi_verify_blk_ioctl(bd, cmd);
-        if (ret < 0)
-                return ret;
-
-        return scsi_cmd_ioctl(bd->bd_disk->queue, bd->bd_disk, mode, cmd, arg);
-}
-EXPORT_SYMBOL(scsi_cmd_blk_ioctl);
-
 static int __init blk_scsi_ioctl_init(void)
 {
         blk_set_cmd_filter_defaults(&blk_default_cmd_filter);