diff options
Diffstat (limited to 'drivers/message/i2o')
-rw-r--r-- | drivers/message/i2o/i2o_block.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c index 71500dda8eb3..11a617ab4243 100644 --- a/drivers/message/i2o/i2o_block.c +++ b/drivers/message/i2o/i2o_block.c | |||
@@ -575,9 +575,9 @@ static void i2o_block_biosparam(unsigned long capacity, unsigned short *cyls, | |||
575 | * | 575 | * |
576 | * Returns 0 on success or negative error code on failure. | 576 | * Returns 0 on success or negative error code on failure. |
577 | */ | 577 | */ |
578 | static int i2o_block_open(struct inode *inode, struct file *file) | 578 | static int i2o_block_open(struct block_device *bdev, fmode_t mode) |
579 | { | 579 | { |
580 | struct i2o_block_device *dev = inode->i_bdev->bd_disk->private_data; | 580 | struct i2o_block_device *dev = bdev->bd_disk->private_data; |
581 | 581 | ||
582 | if (!dev->i2o_dev) | 582 | if (!dev->i2o_dev) |
583 | return -ENODEV; | 583 | return -ENODEV; |
@@ -604,9 +604,8 @@ static int i2o_block_open(struct inode *inode, struct file *file) | |||
604 | * | 604 | * |
605 | * Returns 0 on success or negative error code on failure. | 605 | * Returns 0 on success or negative error code on failure. |
606 | */ | 606 | */ |
607 | static int i2o_block_release(struct inode *inode, struct file *file) | 607 | static int i2o_block_release(struct gendisk *disk, fmode_t mode) |
608 | { | 608 | { |
609 | struct gendisk *disk = inode->i_bdev->bd_disk; | ||
610 | struct i2o_block_device *dev = disk->private_data; | 609 | struct i2o_block_device *dev = disk->private_data; |
611 | u8 operation; | 610 | u8 operation; |
612 | 611 | ||
@@ -653,10 +652,10 @@ static int i2o_block_getgeo(struct block_device *bdev, struct hd_geometry *geo) | |||
653 | * | 652 | * |
654 | * Return 0 on success or negative error on failure. | 653 | * Return 0 on success or negative error on failure. |
655 | */ | 654 | */ |
656 | static int i2o_block_ioctl(struct inode *inode, struct file *file, | 655 | static int i2o_block_ioctl(struct block_device *bdev, fmode_t mode, |
657 | unsigned int cmd, unsigned long arg) | 656 | unsigned int cmd, unsigned long arg) |
658 | { | 657 | { |
659 | struct gendisk *disk = inode->i_bdev->bd_disk; | 658 | struct gendisk *disk = bdev->bd_disk; |
660 | struct i2o_block_device *dev = disk->private_data; | 659 | struct i2o_block_device *dev = disk->private_data; |
661 | 660 | ||
662 | /* Anyone capable of this syscall can do *real bad* things */ | 661 | /* Anyone capable of this syscall can do *real bad* things */ |
@@ -931,9 +930,9 @@ static void i2o_block_request_fn(struct request_queue *q) | |||
931 | /* I2O Block device operations definition */ | 930 | /* I2O Block device operations definition */ |
932 | static struct block_device_operations i2o_block_fops = { | 931 | static struct block_device_operations i2o_block_fops = { |
933 | .owner = THIS_MODULE, | 932 | .owner = THIS_MODULE, |
934 | .__open = i2o_block_open, | 933 | .open = i2o_block_open, |
935 | .__release = i2o_block_release, | 934 | .release = i2o_block_release, |
936 | .__ioctl = i2o_block_ioctl, | 935 | .locked_ioctl = i2o_block_ioctl, |
937 | .getgeo = i2o_block_getgeo, | 936 | .getgeo = i2o_block_getgeo, |
938 | .media_changed = i2o_block_media_changed | 937 | .media_changed = i2o_block_media_changed |
939 | }; | 938 | }; |