redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[PATCH] switch viodasd 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
hifive-unleashed-5.1
Al Viro 2008-03-02 10:22:07 -05:00
parent 4099a96693
commit f115a14ae4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/block/viodasd.c
View File

@ -130,15 +130,15 @@ struct viodasd_device {
/* /*
* External open entry point. * 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; HvLpEvent_Rc hvrc;
struct viodasd_waitevent we; struct viodasd_waitevent we;
u16 flags = 0; u16 flags = 0;
if (d->read_only) { if (d->read_only) {
if ((fil != NULL) && (fil->f_mode & FMODE_WRITE)) if (mode & FMODE_WRITE)
return -EROFS; return -EROFS;
flags = vioblockflags_ro; flags = vioblockflags_ro;
} }
@ -179,9 +179,9 @@ static int viodasd_open(struct inode *ino, struct file *fil)
/* /*
* External release entry point. * 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; HvLpEvent_Rc hvrc;
/* Send the event to OS/400. We DON'T expect a response */ /* 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 = { static struct block_device_operations viodasd_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.__open = viodasd_open, .open = viodasd_open,
.__release = viodasd_release, .release = viodasd_release,
.getgeo = viodasd_getgeo, .getgeo = viodasd_getgeo,
}; };