commit 961846ca5aae2f39d061e057ae6ad0b54b134008
author Al Viro <viro@zeniv.linux.org.uk> Sun Mar 02 10:23:12 2008 -0500
committer Al Viro <viro@zeniv.linux.org.uk> Tue Oct 21 07:48:11 2008 -0400
tree af98d98a32458d306da75f54411d82d4f64a8bbe
parent 4e1098529816994fc1513050cd52bbe6e0dbf2cc

[PATCH] switch xd

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

drivers/block/xd.c

diff --git a/drivers/block/xd.c b/drivers/block/xd.c
index 316fa1d..64b496f 100644
--- a/drivers/block/xd.c
+++ b/drivers/block/xd.c
@@ -132,7 +132,7 @@
 
 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 @@
 }
 
 /* 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:

drivers/block/xd.h

diff --git a/drivers/block/xd.h b/drivers/block/xd.h
index cffd44a..37cacef 100644
--- a/drivers/block/xd.h
+++ b/drivers/block/xd.h
@@ -105,7 +105,7 @@
 static u_char xd_initdrives (void (*init_drive)(u_char drive));
 
 static void do_xd_request (struct request_queue * q);
-static int xd_ioctl (struct inode *inode,struct file *file,unsigned int cmd,unsigned long arg);
+static int xd_ioctl (struct block_device *bdev,fmode_t mode,unsigned int cmd,unsigned long arg);
 static int xd_readwrite (u_char operation,XD_INFO *disk,char *buffer,u_int block,u_int count);
 static void xd_recalibrate (u_char drive);