summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-03-02 10:24:18 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2008-10-21 07:48:15 -0400
commitf3f68b367389bcbe1823e6e775f4ec32d7d69b40 (patch)
tree87702355c8bb606bfa71dfd40f3bbba8a2b782a4 /drivers/block
parenta63c848b04052acac653d6164160488d6c52ff9e (diff)
downloadlinux-f3f68b367389bcbe1823e6e775f4ec32d7d69b40.tar.gz
linux-f3f68b367389bcbe1823e6e775f4ec32d7d69b40.tar.bz2
linux-f3f68b367389bcbe1823e6e775f4ec32d7d69b40.zip
[PATCH] switch xyspace
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/xsysace.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index e4efe5b7ec22..ecab9e67d47a 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -870,25 +870,24 @@ static int ace_revalidate_disk(struct gendisk *gd)
return ace->id_result;
}
-static int ace_open(struct inode *inode, struct file *filp)
+static int ace_open(struct block_device *bdev, fmode_t mode)
{
- struct ace_device *ace = inode->i_bdev->bd_disk->private_data;
+ struct ace_device *ace = bdev->bd_disk->private_data;
unsigned long flags;
dev_dbg(ace->dev, "ace_open() users=%i\n", ace->users + 1);
- filp->private_data = ace;
spin_lock_irqsave(&ace->lock, flags);
ace->users++;
spin_unlock_irqrestore(&ace->lock, flags);
- check_disk_change(inode->i_bdev);
+ check_disk_change(bdev);
return 0;
}
-static int ace_release(struct inode *inode, struct file *filp)
+static int ace_release(struct gendisk *disk, fmode_t mode)
{
- struct ace_device *ace = inode->i_bdev->bd_disk->private_data;
+ struct ace_device *ace = disk->private_data;
unsigned long flags;
u16 val;
@@ -919,8 +918,8 @@ static int ace_getgeo(struct block_device *bdev, struct hd_geometry *geo)
static struct block_device_operations ace_fops = {
.owner = THIS_MODULE,
- .__open = ace_open,
- .__release = ace_release,
+ .open = ace_open,
+ .release = ace_release,
.media_changed = ace_media_changed,
.revalidate_disk = ace_revalidate_disk,
.getgeo = ace_getgeo,