summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-03-02 10:22:33 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2008-10-21 07:48:09 -0400
commit4e1098529816994fc1513050cd52bbe6e0dbf2cc (patch)
treecacf566c4a81c3fc33704d77aa13cb5fcb5e5409 /drivers/block
parentf115a14ae43242b485ed5995a0746e6db59951f2 (diff)
downloadlinux-4e1098529816994fc1513050cd52bbe6e0dbf2cc.tar.gz
linux-4e1098529816994fc1513050cd52bbe6e0dbf2cc.tar.bz2
linux-4e1098529816994fc1513050cd52bbe6e0dbf2cc.zip
[PATCH] switch virtio_blk
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/virtio_blk.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 10f157ea7b0b..85d79a02d487 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -146,11 +146,11 @@ static void do_virtblk_request(struct request_queue *q)
vblk->vq->vq_ops->kick(vblk->vq);
}
-static int virtblk_ioctl(struct inode *inode, struct file *filp,
+static int virtblk_ioctl(struct block_device *bdev, fmode_t mode,
unsigned cmd, unsigned long data)
{
- return scsi_cmd_ioctl(inode->i_bdev->bd_disk->queue,
- inode->i_bdev->bd_disk, filp->f_mode, cmd,
+ return scsi_cmd_ioctl(bdev->bd_disk->queue,
+ bdev->bd_disk, mode, cmd,
(void __user *)data);
}
@@ -180,7 +180,7 @@ static int virtblk_getgeo(struct block_device *bd, struct hd_geometry *geo)
}
static struct block_device_operations virtblk_fops = {
- .__ioctl = virtblk_ioctl,
+ .locked_ioctl = virtblk_ioctl,
.owner = THIS_MODULE,
.getgeo = virtblk_getgeo,
};