From 81ded3d993bbfa5ecfbded306a35d878f873108e Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 2 Mar 2008 10:22:33 -0500 Subject: [PATCH] --- yaml --- r: 117524 b: refs/heads/master c: 4e1098529816994fc1513050cd52bbe6e0dbf2cc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/virtio_blk.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f7c2cf43cfca..c1aa85f7564e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f115a14ae43242b485ed5995a0746e6db59951f2 +refs/heads/master: 4e1098529816994fc1513050cd52bbe6e0dbf2cc diff --git a/trunk/drivers/block/virtio_blk.c b/trunk/drivers/block/virtio_blk.c index 10f157ea7b0b..85d79a02d487 100644 --- a/trunk/drivers/block/virtio_blk.c +++ b/trunk/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, };