diff options
Diffstat (limited to 'drivers/block/xen-blkfront.c')
-rw-r--r-- | drivers/block/xen-blkfront.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 7efac80c8dd..b220c686089 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c | |||
@@ -156,11 +156,10 @@ static int blkif_getgeo(struct block_device *bd, struct hd_geometry *hg) | |||
156 | return 0; | 156 | return 0; |
157 | } | 157 | } |
158 | 158 | ||
159 | static int blkif_ioctl(struct inode *inode, struct file *filep, | 159 | static int blkif_ioctl(struct block_device *bdev, fmode_t mode, |
160 | unsigned command, unsigned long argument) | 160 | unsigned command, unsigned long argument) |
161 | { | 161 | { |
162 | struct blkfront_info *info = | 162 | struct blkfront_info *info = bdev->bd_disk->private_data; |
163 | inode->i_bdev->bd_disk->private_data; | ||
164 | int i; | 163 | int i; |
165 | 164 | ||
166 | dev_dbg(&info->xbdev->dev, "command: 0x%x, argument: 0x%lx\n", | 165 | dev_dbg(&info->xbdev->dev, "command: 0x%x, argument: 0x%lx\n", |
@@ -1014,16 +1013,16 @@ static int blkfront_is_ready(struct xenbus_device *dev) | |||
1014 | return info->is_ready; | 1013 | return info->is_ready; |
1015 | } | 1014 | } |
1016 | 1015 | ||
1017 | static int blkif_open(struct inode *inode, struct file *filep) | 1016 | static int blkif_open(struct block_device *bdev, fmode_t mode) |
1018 | { | 1017 | { |
1019 | struct blkfront_info *info = inode->i_bdev->bd_disk->private_data; | 1018 | struct blkfront_info *info = bdev->bd_disk->private_data; |
1020 | info->users++; | 1019 | info->users++; |
1021 | return 0; | 1020 | return 0; |
1022 | } | 1021 | } |
1023 | 1022 | ||
1024 | static int blkif_release(struct inode *inode, struct file *filep) | 1023 | static int blkif_release(struct gendisk *disk, fmode_t mode) |
1025 | { | 1024 | { |
1026 | struct blkfront_info *info = inode->i_bdev->bd_disk->private_data; | 1025 | struct blkfront_info *info = disk->private_data; |
1027 | info->users--; | 1026 | info->users--; |
1028 | if (info->users == 0) { | 1027 | if (info->users == 0) { |
1029 | /* Check whether we have been instructed to close. We will | 1028 | /* Check whether we have been instructed to close. We will |
@@ -1041,10 +1040,10 @@ static int blkif_release(struct inode *inode, struct file *filep) | |||
1041 | static struct block_device_operations xlvbd_block_fops = | 1040 | static struct block_device_operations xlvbd_block_fops = |
1042 | { | 1041 | { |
1043 | .owner = THIS_MODULE, | 1042 | .owner = THIS_MODULE, |
1044 | .__open = blkif_open, | 1043 | .open = blkif_open, |
1045 | .__release = blkif_release, | 1044 | .release = blkif_release, |
1046 | .getgeo = blkif_getgeo, | 1045 | .getgeo = blkif_getgeo, |
1047 | .ioctl = blkif_ioctl, | 1046 | .locked_ioctl = blkif_ioctl, |
1048 | }; | 1047 | }; |
1049 | 1048 | ||
1050 | 1049 | ||