AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[PATCH] switch xen

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2008-03-02 10:23:47 -05:00
parent 961846ca5a
commit a63c848b04
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/block/xen-blkfront.c
View File

@ -156,11 +156,10 @@ static int blkif_getgeo(struct block_device *bd, struct hd_geometry *hg)
return 0;
}
static int blkif_ioctl(struct inode *inode, struct file *filep,
static int blkif_ioctl(struct block_device *bdev, fmode_t mode,
unsigned command, unsigned long argument)
{
struct blkfront_info *info =
inode->i_bdev->bd_disk->private_data;
struct blkfront_info *info = bdev->bd_disk->private_data;
int i;
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)
return info->is_ready;
}
static int blkif_open(struct inode *inode, struct file *filep)
static int blkif_open(struct block_device *bdev, fmode_t mode)
{
struct blkfront_info *info = inode->i_bdev->bd_disk->private_data;
struct blkfront_info *info = bdev->bd_disk->private_data;
info->users++;
return 0;
}
static int blkif_release(struct inode *inode, struct file *filep)
static int blkif_release(struct gendisk *disk, fmode_t mode)
{
struct blkfront_info *info = inode->i_bdev->bd_disk->private_data;
struct blkfront_info *info = disk->private_data;
info->users--;
if (info->users == 0) {
/* Check whether we have been instructed to close. We will
@ -1041,10 +1040,10 @@ static int blkif_release(struct inode *inode, struct file *filep)
static struct block_device_operations xlvbd_block_fops =
{
.owner = THIS_MODULE,
.__open = blkif_open,
.__release = blkif_release,
.open = blkif_open,
.release = blkif_release,
.getgeo = blkif_getgeo,
.ioctl = blkif_ioctl,
.locked_ioctl = blkif_ioctl,
};