diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-03-02 10:43:36 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-10-21 07:48:52 -0400 |
| commit | 90b8f2824ce68dd87d304641a1d5a048dfff39f5 (patch) | |
| tree | b55ddcb619aac1e16d845dd6796c51721dd6ee56 /block/compat_ioctl.c | |
| parent | 40cc51be699e37b78102ce7b2196ec9c32fe1908 (diff) | |
| download | linux-stable-90b8f2824ce68dd87d304641a1d5a048dfff39f5.tar.gz linux-stable-90b8f2824ce68dd87d304641a1d5a048dfff39f5.tar.bz2 linux-stable-90b8f2824ce68dd87d304641a1d5a048dfff39f5.zip | |
[PATCH] end of methods switch: remove the old ones
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'block/compat_ioctl.c')
| -rw-r--r-- | block/compat_ioctl.c | 12 |
1 files changed, 0 insertions, 12 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); |