---

yaml --- r: 117509 b: refs/heads/master c: 94562c1 h: refs/heads/master i: 117507: 3b7b761 v: v3
git-mirror · Oct 21, 2008 · ed06731 · ed06731
1 parent 3fbb1d7
commit ed06731
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git 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
@@ -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,
 };