diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-03-02 10:36:08 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-10-21 07:48:40 -0400 |
| commit | 57a7c0bca009059d1d85bec608af70aa6c5f344c (patch) | |
| tree | 79a7124566adfae19e379ce64252dc712d7cd795 /drivers/s390/block/dasd_ioctl.c | |
| parent | af0e2a0a87a7daeff9b77d82376c98fc6de3443f (diff) | |
| download | kernel_samsung_smdk4412-57a7c0bca009059d1d85bec608af70aa6c5f344c.tar.gz kernel_samsung_smdk4412-57a7c0bca009059d1d85bec608af70aa6c5f344c.tar.bz2 kernel_samsung_smdk4412-57a7c0bca009059d1d85bec608af70aa6c5f344c.zip | |
[PATCH] switch dasd
->compat_ioctl() actually had been useless here; generic
logics works fine.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/s390/block/dasd_ioctl.c')
| -rw-r--r-- | drivers/s390/block/dasd_ioctl.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c index 91a64630cb0..b82d816d9ef 100644 --- a/drivers/s390/block/dasd_ioctl.c +++ b/drivers/s390/block/dasd_ioctl.c @@ -366,10 +366,9 @@ static int dasd_ioctl_readall_cmb(struct dasd_block *block, unsigned int cmd, } int -dasd_ioctl(struct inode *inode, struct file *file, +dasd_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg) { - struct block_device *bdev = inode->i_bdev; struct dasd_block *block = bdev->bd_disk->private_data; void __user *argp = (void __user *)arg; @@ -421,15 +420,3 @@ dasd_ioctl(struct inode *inode, struct file *file, return -EINVAL; } } - -long -dasd_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) -{ - int rval; - - lock_kernel(); - rval = dasd_ioctl(filp->f_path.dentry->d_inode, filp, cmd, arg); - unlock_kernel(); - - return (rval == -EINVAL) ? -ENOIOCTLCMD : rval; -} |