diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2008-03-02 10:22:33 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-10-21 07:48:09 -0400 |
commit | 4e1098529816994fc1513050cd52bbe6e0dbf2cc (patch) | |
tree | cacf566c4a81c3fc33704d77aa13cb5fcb5e5409 /drivers/block/virtio_blk.c | |
parent | f115a14ae43242b485ed5995a0746e6db59951f2 (diff) |
[PATCH] switch virtio_blk
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/block/virtio_blk.c')
-rw-r--r-- | drivers/block/virtio_blk.c | 8 |
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) | |||
146 | vblk->vq->vq_ops->kick(vblk->vq); | 146 | vblk->vq->vq_ops->kick(vblk->vq); |
147 | } | 147 | } |
148 | 148 | ||
149 | static int virtblk_ioctl(struct inode *inode, struct file *filp, | 149 | static int virtblk_ioctl(struct block_device *bdev, fmode_t mode, |
150 | unsigned cmd, unsigned long data) | 150 | unsigned cmd, unsigned long data) |
151 | { | 151 | { |
152 | return scsi_cmd_ioctl(inode->i_bdev->bd_disk->queue, | 152 | return scsi_cmd_ioctl(bdev->bd_disk->queue, |
153 | inode->i_bdev->bd_disk, filp->f_mode, cmd, | 153 | bdev->bd_disk, mode, cmd, |
154 | (void __user *)data); | 154 | (void __user *)data); |
155 | } | 155 | } |
156 | 156 | ||
@@ -180,7 +180,7 @@ static int virtblk_getgeo(struct block_device *bd, struct hd_geometry *geo) | |||
180 | } | 180 | } |
181 | 181 | ||
182 | static struct block_device_operations virtblk_fops = { | 182 | static struct block_device_operations virtblk_fops = { |
183 | .__ioctl = virtblk_ioctl, | 183 | .locked_ioctl = virtblk_ioctl, |
184 | .owner = THIS_MODULE, | 184 | .owner = THIS_MODULE, |
185 | .getgeo = virtblk_getgeo, | 185 | .getgeo = virtblk_getgeo, |
186 | }; | 186 | }; |