From ed06731b2f23fabe3edede7ed6339d2b4570b6ce Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 2 Mar 2008 09:23:18 -0500 Subject: [PATCH] --- yaml --- r: 117509 b: refs/heads/master c: 94562c175113cf91204a77269eabeea32e1f38db h: refs/heads/master i: 117507: 3b7b7612b4f74b00304cc030b013e932aad0928d v: v3 --- [refs] | 2 +- trunk/drivers/block/aoe/aoeblk.c | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index abb0ec277fb1..9935575e8959 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47225db519f9d54377b8598129b53a63fcc2f4e2 +refs/heads/master: 94562c175113cf91204a77269eabeea32e1f38db diff --git a/trunk/drivers/block/aoe/aoeblk.c b/trunk/drivers/block/aoe/aoeblk.c index d4d9796d5ddd..1747dd272cd4 100644 --- a/trunk/drivers/block/aoe/aoeblk.c +++ b/trunk/drivers/block/aoe/aoeblk.c @@ -118,13 +118,11 @@ aoedisk_rm_sysfs(struct aoedev *d) } static int -aoeblk_open(struct inode *inode, struct file *filp) +aoeblk_open(struct block_device *bdev, fmode_t mode) { - struct aoedev *d; + struct aoedev *d = bdev->bd_disk->private_data; ulong flags; - d = inode->i_bdev->bd_disk->private_data; - spin_lock_irqsave(&d->lock, flags); if (d->flags & DEVFL_UP) { d->nopen++; @@ -136,13 +134,11 @@ aoeblk_open(struct inode *inode, struct file *filp) } static int -aoeblk_release(struct inode *inode, struct file *filp) +aoeblk_release(struct gendisk *disk, fmode_t mode) { - struct aoedev *d; + struct aoedev *d = disk->private_data; ulong flags; - d = inode->i_bdev->bd_disk->private_data; - spin_lock_irqsave(&d->lock, flags); if (--d->nopen == 0) { @@ -239,8 +235,8 @@ aoeblk_getgeo(struct block_device *bdev, struct hd_geometry *geo) } static struct block_device_operations aoe_bdops = { - .__open = aoeblk_open, - .__release = aoeblk_release, + .open = aoeblk_open, + .release = aoeblk_release, .getgeo = aoeblk_getgeo, .owner = THIS_MODULE, };