Commit 0000d031 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky

[S390] dasd: enable compat ioctls

All of the ioctls are compatible. Just enable them.
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 59fa4392
...@@ -2101,7 +2101,8 @@ dasd_device_operations = { ...@@ -2101,7 +2101,8 @@ dasd_device_operations = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = dasd_open, .open = dasd_open,
.release = dasd_release, .release = dasd_release,
.locked_ioctl = dasd_ioctl, .ioctl = dasd_ioctl,
.compat_ioctl = dasd_ioctl,
.getgeo = dasd_getgeo, .getgeo = dasd_getgeo,
}; };
......
...@@ -365,9 +365,9 @@ static int dasd_ioctl_readall_cmb(struct dasd_block *block, unsigned int cmd, ...@@ -365,9 +365,9 @@ static int dasd_ioctl_readall_cmb(struct dasd_block *block, unsigned int cmd,
return ret; return ret;
} }
int static int
dasd_ioctl(struct block_device *bdev, fmode_t mode, dasd_do_ioctl(struct block_device *bdev, fmode_t mode,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
struct dasd_block *block = bdev->bd_disk->private_data; struct dasd_block *block = bdev->bd_disk->private_data;
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
...@@ -420,3 +420,14 @@ dasd_ioctl(struct block_device *bdev, fmode_t mode, ...@@ -420,3 +420,14 @@ dasd_ioctl(struct block_device *bdev, fmode_t mode,
return -EINVAL; return -EINVAL;
} }
} }
int dasd_ioctl(struct block_device *bdev, fmode_t mode,
unsigned int cmd, unsigned long arg)
{
int rc;
lock_kernel();
rc = dasd_do_ioctl(bdev, mode, cmd, arg);
unlock_kernel();
return rc;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment