summaryrefslogtreecommitdiff
path: root/drivers/block/xd.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-03-02 10:23:12 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2008-10-21 07:48:11 -0400
commit961846ca5aae2f39d061e057ae6ad0b54b134008 (patch)
treeaf98d98a32458d306da75f54411d82d4f64a8bbe /drivers/block/xd.c
parent4e1098529816994fc1513050cd52bbe6e0dbf2cc (diff)
downloadlinux-3.10-961846ca5aae2f39d061e057ae6ad0b54b134008.tar.gz
linux-3.10-961846ca5aae2f39d061e057ae6ad0b54b134008.tar.bz2
linux-3.10-961846ca5aae2f39d061e057ae6ad0b54b134008.zip
[PATCH] switch xd
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/block/xd.c')
-rw-r--r--drivers/block/xd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/xd.c b/drivers/block/xd.c
index 316fa1da4b9..64b496fce98 100644
--- a/drivers/block/xd.c
+++ b/drivers/block/xd.c
@@ -132,7 +132,7 @@ static int xd_getgeo(struct block_device *bdev, struct hd_geometry *geo);
static struct block_device_operations xd_fops = {
.owner = THIS_MODULE,
- .__ioctl = xd_ioctl,
+ .locked_ioctl = xd_ioctl,
.getgeo = xd_getgeo,
};
static DECLARE_WAIT_QUEUE_HEAD(xd_wait_int);
@@ -343,7 +343,7 @@ static int xd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
}
/* xd_ioctl: handle device ioctl's */
-static int xd_ioctl (struct inode *inode,struct file *file,u_int cmd,u_long arg)
+static int xd_ioctl(struct block_device *bdev, fmode_t mode, u_int cmd, u_long arg)
{
switch (cmd) {
case HDIO_SET_DMA: