From e5d094c234a7567c5185a142da385bd6c3bf3d34 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 2 Mar 2008 10:24:18 -0500 Subject: [PATCH] --- yaml --- r: 117527 b: refs/heads/master c: f3f68b367389bcbe1823e6e775f4ec32d7d69b40 h: refs/heads/master i: 117525: ca406e5e58574269005cac117c9913d1e2875ca6 117523: 41a2ab848432bb618be0093015ffac9db3674ed5 117519: e135418ce67e641aa828889f66e4a6c02e8f9ddc v: v3 --- [refs] | 2 +- trunk/drivers/block/xsysace.c | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 72ec21fad61c..cc8458444672 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a63c848b04052acac653d6164160488d6c52ff9e +refs/heads/master: f3f68b367389bcbe1823e6e775f4ec32d7d69b40 diff --git a/trunk/drivers/block/xsysace.c b/trunk/drivers/block/xsysace.c index e4efe5b7ec22..ecab9e67d47a 100644 --- a/trunk/drivers/block/xsysace.c +++ b/trunk/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,