2 files changed, 0 insertions, 38 deletions

diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
index 576c4fd15463..fd537fdb25a3 100644
--- a/block/compat_ioctl.c
+++ b/block/compat_ioctl.c
@@ -708,16 +708,6 @@ static int compat_blkdev_driver_ioctl(struct inode *inode, struct file *file,
                 return -ENOIOCTLCMD;
         }
 
-        if (disk->fops->__unlocked_ioctl)
-                return disk->fops->__unlocked_ioctl(file, cmd, arg);
-
-        if (disk->fops->__ioctl) {
-                lock_kernel();
-                ret = disk->fops->__ioctl(inode, file, cmd, arg);
-                unlock_kernel();
-                return ret;
-        }
-
         return __blkdev_driver_ioctl(inode->i_bdev, file->f_mode, cmd, arg);
 }
 
@@ -805,8 +795,6 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
 
         lock_kernel();
         ret = compat_blkdev_locked_ioctl(inode, file, bdev, cmd, arg);
-        if (ret == -ENOIOCTLCMD && disk->fops->__compat_ioctl)
-                ret = disk->fops->__compat_ioctl(file, cmd, arg);
         unlock_kernel();
         if (ret == -ENOIOCTLCMD && disk->fops->compat_ioctl)
                 ret = disk->fops->compat_ioctl(bdev, file->f_mode, cmd, arg);
diff --git a/block/ioctl.c b/block/ioctl.c
index 01ff463bc801..0db89f95b15f 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -276,16 +276,6 @@ int blkdev_driver_ioctl(struct inode *inode, struct file *file,
                         mode |= FMODE_NDELAY_NOW;
         }
 
-        if (disk->fops->__unlocked_ioctl)
-                return disk->fops->__unlocked_ioctl(file, cmd, arg);
-
-        if (disk->fops->__ioctl) {
-                lock_kernel();
-                ret = disk->fops->__ioctl(inode, file, cmd, arg);
-                unlock_kernel();
-                return ret;
-        }
-
         return __blkdev_driver_ioctl(inode->i_bdev, mode, cmd, arg);
 }
 EXPORT_SYMBOL_GPL(blkdev_driver_ioctl);
@@ -295,22 +285,6 @@ int __blkdev_driver_ioctl(struct block_device *bdev, fmode_t mode,
 {
         struct gendisk *disk = bdev->bd_disk;
         int ret;
-        /* you bet it'll go away by the end of patch series */
-        struct file fake_file = {};
-        struct dentry fake_dentry = {};
-        fake_file.f_mode = mode;
-        fake_file.f_path.dentry = &fake_dentry;
-        fake_dentry.d_inode = bdev->bd_inode;
-
-        if (disk->fops->__unlocked_ioctl)
-                return disk->fops->__unlocked_ioctl(&fake_file, cmd, arg);
-
-        if (disk->fops->__ioctl) {
-                lock_kernel();
-                ret = disk->fops->__ioctl(bdev->bd_inode, &fake_file, cmd, arg);
-                unlock_kernel();
-                return ret;
-        }
 
         if (disk->fops->ioctl)
                 return disk->fops->ioctl(bdev, mode, cmd, arg);