aboutsummaryrefslogtreecommitdiff
path: root/block/ioctl.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-03-02 10:43:36 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2008-10-21 07:48:52 -0400
commit90b8f2824ce68dd87d304641a1d5a048dfff39f5 (patch)
treeb55ddcb619aac1e16d845dd6796c51721dd6ee56 /block/ioctl.c
parent40cc51be699e37b78102ce7b2196ec9c32fe1908 (diff)
downloadlinux-90b8f2824ce68dd87d304641a1d5a048dfff39f5.tar.gz
[PATCH] end of methods switch: remove the old ones
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'block/ioctl.c')
-rw-r--r--block/ioctl.c26
1 files changed, 0 insertions, 26 deletions
diff --git a/block/ioctl.c b/block/ioctl.c
index 01ff463bc80..0db89f95b15 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);