[PATCH] switch aoeblk
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
47225db519
commit
94562c1751
|
@ -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,
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue
Block a user