From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 2 Mar 2008 15:22:33 +0000 (-0500)
Subject: [PATCH] switch virtio_blk
X-Git-Tag: v2.6.28-rc1~23^2~33
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4e1098529816994fc1513050cd52bbe6e0dbf2cc;p=linux-2.6-omap-h63xx.git

[PATCH] switch virtio_blk

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 10f157ea7b0..85d79a02d48 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,
 };