tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[PATCH] switch viodasd
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+7
-7
+7
-7
drivers/block/viodasd.c
+7
-7
drivers/block/viodasd.c
···
130
130
/*
131
131
* External open entry point.
132
132
*/
133
-
static int viodasd_open(struct inode *ino, struct file *fil)
133
+
static int viodasd_open(struct block_device *bdev, fmode_t mode)
134
134
{
135
-
struct viodasd_device *d = ino->i_bdev->bd_disk->private_data;
135
+
struct viodasd_device *d = bdev->bd_disk->private_data;
136
136
HvLpEvent_Rc hvrc;
137
137
struct viodasd_waitevent we;
138
138
u16 flags = 0;
139
139
140
140
if (d->read_only) {
141
-
if ((fil != NULL) && (fil->f_mode & FMODE_WRITE))
141
+
if (mode & FMODE_WRITE)
142
142
return -EROFS;
143
143
flags = vioblockflags_ro;
144
144
}
···
179
179
/*
180
180
* External release entry point.
181
181
*/
182
-
static int viodasd_release(struct inode *ino, struct file *fil)
182
+
static int viodasd_release(struct gendisk *disk, fmode_t mode)
183
183
{
184
-
struct viodasd_device *d = ino->i_bdev->bd_disk->private_data;
184
+
struct viodasd_device *d = disk->private_data;
185
185
HvLpEvent_Rc hvrc;
186
186
187
187
/* Send the event to OS/400. We DON'T expect a response */
···
221
221
*/
222
222
static struct block_device_operations viodasd_fops = {
223
223
.owner = THIS_MODULE,
224
-
.__open = viodasd_open,
225
-
.__release = viodasd_release,
224
+
.open = viodasd_open,
225
+
.release = viodasd_release,
226
226
.getgeo = viodasd_getgeo,
227
227
};
228
228