diff options
Diffstat (limited to 'drivers/block/aoe/aoeblk.c')
-rw-r--r-- | drivers/block/aoe/aoeblk.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c index d876ad861237..1747dd272cd4 100644 --- a/drivers/block/aoe/aoeblk.c +++ b/drivers/block/aoe/aoeblk.c | |||
@@ -118,13 +118,11 @@ aoedisk_rm_sysfs(struct aoedev *d) | |||
118 | } | 118 | } |
119 | 119 | ||
120 | static int | 120 | static int |
121 | aoeblk_open(struct inode *inode, struct file *filp) | 121 | aoeblk_open(struct block_device *bdev, fmode_t mode) |
122 | { | 122 | { |
123 | struct aoedev *d; | 123 | struct aoedev *d = bdev->bd_disk->private_data; |
124 | ulong flags; | 124 | ulong flags; |
125 | 125 | ||
126 | d = inode->i_bdev->bd_disk->private_data; | ||
127 | |||
128 | spin_lock_irqsave(&d->lock, flags); | 126 | spin_lock_irqsave(&d->lock, flags); |
129 | if (d->flags & DEVFL_UP) { | 127 | if (d->flags & DEVFL_UP) { |
130 | d->nopen++; | 128 | d->nopen++; |
@@ -136,13 +134,11 @@ aoeblk_open(struct inode *inode, struct file *filp) | |||
136 | } | 134 | } |
137 | 135 | ||
138 | static int | 136 | static int |
139 | aoeblk_release(struct inode *inode, struct file *filp) | 137 | aoeblk_release(struct gendisk *disk, fmode_t mode) |
140 | { | 138 | { |
141 | struct aoedev *d; | 139 | struct aoedev *d = disk->private_data; |
142 | ulong flags; | 140 | ulong flags; |
143 | 141 | ||
144 | d = inode->i_bdev->bd_disk->private_data; | ||
145 | |||
146 | spin_lock_irqsave(&d->lock, flags); | 142 | spin_lock_irqsave(&d->lock, flags); |
147 | 143 | ||
148 | if (--d->nopen == 0) { | 144 | if (--d->nopen == 0) { |