diff options
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 91a64630cb0f..b82d816d9ef7 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, | |||
366 | } | 366 | } |
367 | 367 | ||
368 | int | 368 | int |
369 | dasd_ioctl(struct inode *inode, struct file *file, | 369 | dasd_ioctl(struct block_device *bdev, fmode_t mode, |
370 | unsigned int cmd, unsigned long arg) | 370 | unsigned int cmd, unsigned long arg) |
371 | { | 371 | { |
372 | struct block_device *bdev = inode->i_bdev; | ||
373 | struct dasd_block *block = bdev->bd_disk->private_data; | 372 | struct dasd_block *block = bdev->bd_disk->private_data; |
374 | void __user *argp = (void __user *)arg; | 373 | void __user *argp = (void __user *)arg; |
375 | 374 | ||
@@ -421,15 +420,3 @@ dasd_ioctl(struct inode *inode, struct file *file, | |||
421 | return -EINVAL; | 420 | return -EINVAL; |
422 | } | 421 | } |
423 | } | 422 | } |
424 | |||
425 | long | ||
426 | dasd_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | ||
427 | { | ||
428 | int rval; | ||
429 | |||
430 | lock_kernel(); | ||
431 | rval = dasd_ioctl(filp->f_path.dentry->d_inode, filp, cmd, arg); | ||
432 | unlock_kernel(); | ||
433 | |||
434 | return (rval == -EINVAL) ? -ENOIOCTLCMD : rval; | ||
435 | } | ||