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.c | |
| parent | af0e2a0a87a7daeff9b77d82376c98fc6de3443f (diff) | |
[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.c')
| -rw-r--r-- | drivers/s390/block/dasd.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index 6bf68e5fe89f..4b76fca64a6f 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c @@ -2011,10 +2011,9 @@ static void dasd_flush_request_queue(struct dasd_block *block) spin_unlock_irq(&block->request_queue_lock); } -static int dasd_open(struct inode *inp, struct file *filp) +static int dasd_open(struct block_device *bdev, fmode_t mode) { - struct gendisk *disk = inp->i_bdev->bd_disk; - struct dasd_block *block = disk->private_data; + struct dasd_block *block = bdev->bd_disk->private_data; struct dasd_device *base = block->base; int rc; @@ -2052,9 +2051,8 @@ unlock: return rc; } -static int dasd_release(struct inode *inp, struct file *filp) +static int dasd_release(struct gendisk *disk, fmode_t mode) { - struct gendisk *disk = inp->i_bdev->bd_disk; struct dasd_block *block = disk->private_data; atomic_dec(&block->open_count); @@ -2087,10 +2085,9 @@ static int dasd_getgeo(struct block_device *bdev, struct hd_geometry *geo) struct block_device_operations dasd_device_operations = { .owner = THIS_MODULE, - .__open = dasd_open, - .__release = dasd_release, - .__ioctl = dasd_ioctl, - .__compat_ioctl = dasd_compat_ioctl, + .open = dasd_open, + .release = dasd_release, + .locked_ioctl = dasd_ioctl, .getgeo = dasd_getgeo, }; |