diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-03-02 16:22:07 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-10-21 13:48:07 +0200 |
| commit | f115a14ae43242b485ed5995a0746e6db59951f2 (patch) | |
| tree | 4a2accd06cfc87e576dfc8c5514a12ffece3a187 /drivers/block | |
| parent | [PATCH] switch ub (diff) | |
| download | linux-f115a14ae43242b485ed5995a0746e6db59951f2.tar.xz linux-f115a14ae43242b485ed5995a0746e6db59951f2.zip | |
[PATCH] switch viodasd
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/viodasd.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c index 7f7beec29ebb..ecccf65dce2f 100644 --- a/drivers/block/viodasd.c +++ b/drivers/block/viodasd.c @@ -130,15 +130,15 @@ struct viodasd_device { /* * External open entry point. */ -static int viodasd_open(struct inode *ino, struct file *fil) +static int viodasd_open(struct block_device *bdev, fmode_t mode) { - struct viodasd_device *d = ino->i_bdev->bd_disk->private_data; + struct viodasd_device *d = bdev->bd_disk->private_data; HvLpEvent_Rc hvrc; struct viodasd_waitevent we; u16 flags = 0; if (d->read_only) { - if ((fil != NULL) && (fil->f_mode & FMODE_WRITE)) + if (mode & FMODE_WRITE) return -EROFS; flags = vioblockflags_ro; } @@ -179,9 +179,9 @@ static int viodasd_open(struct inode *ino, struct file *fil) /* * External release entry point. */ -static int viodasd_release(struct inode *ino, struct file *fil) +static int viodasd_release(struct gendisk *disk, fmode_t mode) { - struct viodasd_device *d = ino->i_bdev->bd_disk->private_data; + struct viodasd_device *d = disk->private_data; HvLpEvent_Rc hvrc; /* Send the event to OS/400. We DON'T expect a response */ @@ -221,8 +221,8 @@ static int viodasd_getgeo(struct block_device *bdev, struct hd_geometry *geo) */ static struct block_device_operations viodasd_fops = { .owner = THIS_MODULE, - .__open = viodasd_open, - .__release = viodasd_release, + .open = viodasd_open, + .release = viodasd_release, .getgeo = viodasd_getgeo, }; |