1 files changed, 1 insertions, 20 deletions

diff --git a/block/ioctl.c b/block/ioctl.c
index e8eb679f2f9b..09fd7f1ef23a 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -163,18 +163,10 @@ int __blkdev_driver_ioctl(struct block_device *bdev, fmode_t mode,
                         unsigned cmd, unsigned long arg)
 {
         struct gendisk *disk = bdev->bd_disk;
-        int ret;
 
         if (disk->fops->ioctl)
                 return disk->fops->ioctl(bdev, mode, cmd, arg);
 
-        if (disk->fops->locked_ioctl) {
-                lock_kernel();
-                ret = disk->fops->locked_ioctl(bdev, mode, cmd, arg);
-                unlock_kernel();
-                return ret;
-        }
-
         return -ENOTTY;
 }
 /*
@@ -185,8 +177,7 @@ int __blkdev_driver_ioctl(struct block_device *bdev, fmode_t mode,
 EXPORT_SYMBOL_GPL(__blkdev_driver_ioctl);
 
 /*
- * always keep this in sync with compat_blkdev_ioctl() and
- * compat_blkdev_locked_ioctl()
+ * always keep this in sync with compat_blkdev_ioctl()
  */
 int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
                         unsigned long arg)
@@ -206,10 +197,8 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
                 if (ret != -EINVAL && ret != -ENOTTY)
                         return ret;
 
-                lock_kernel();
                 fsync_bdev(bdev);
                 invalidate_bdev(bdev);
-                unlock_kernel();
                 return 0;
 
         case BLKROSET:
@@ -221,9 +210,7 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
                         return -EACCES;
                 if (get_user(n, (int __user *)(arg)))
                         return -EFAULT;
-                lock_kernel();
                 set_device_ro(bdev, n);
-                unlock_kernel();
                 return 0;
 
         case BLKDISCARD: {
@@ -309,14 +296,10 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
                         bd_release(bdev);
                 return ret;
         case BLKPG:
-                lock_kernel();
                 ret = blkpg_ioctl(bdev, (struct blkpg_ioctl_arg __user *) arg);
-                unlock_kernel();
                 break;
         case BLKRRPART:
-                lock_kernel();
                 ret = blkdev_reread_part(bdev);
-                unlock_kernel();
                 break;
         case BLKGETSIZE:
                 size = bdev->bd_inode->i_size;
@@ -329,9 +312,7 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,
         case BLKTRACESTOP:
         case BLKTRACESETUP:
         case BLKTRACETEARDOWN:
-                lock_kernel();
                 ret = blk_trace_ioctl(bdev, cmd, (char __user *) arg);
-                unlock_kernel();
                 break;
         default:
                 ret = __blkdev_driver_ioctl(bdev, mode, cmd, arg);