From ca406e5e58574269005cac117c9913d1e2875ca6 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 2 Mar 2008 10:23:12 -0500 Subject: [PATCH] --- yaml --- r: 117525 b: refs/heads/master c: 961846ca5aae2f39d061e057ae6ad0b54b134008 h: refs/heads/master i: 117523: 41a2ab848432bb618be0093015ffac9db3674ed5 v: v3 --- [refs] | 2 +- trunk/drivers/block/xd.c | 4 ++-- trunk/drivers/block/xd.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c1aa85f7564e..0c65e5fdc958 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e1098529816994fc1513050cd52bbe6e0dbf2cc +refs/heads/master: 961846ca5aae2f39d061e057ae6ad0b54b134008 diff --git a/trunk/drivers/block/xd.c b/trunk/drivers/block/xd.c index 316fa1da4b9c..64b496fce98b 100644 --- a/trunk/drivers/block/xd.c +++ b/trunk/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: diff --git a/trunk/drivers/block/xd.h b/trunk/drivers/block/xd.h index cffd44a20383..37cacef16e93 100644 --- a/trunk/drivers/block/xd.h +++ b/trunk/drivers/block/xd.h @@ -105,7 +105,7 @@ static u_char xd_detect (u_char *controller, unsigned int *address); 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);