From: Bill Pemberton Date: Mon, 27 Jul 2009 20:47:29 +0000 (-0400) Subject: Staging: hv: fix blkvsc_ioctl() parameters X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dfe8b2d9d809fef5df24280e1e275fcd30776bd5;p=linux-beck.git Staging: hv: fix blkvsc_ioctl() parameters blkvsc_ioctl() had the wrong parameter list for struct block_device_operations Signed-off-by: Bill Pemberton Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index 4bf77eeece7a..5322e570bd8c 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c @@ -129,8 +129,8 @@ static int blkvsc_release(struct gendisk *disk, fmode_t mode); static int blkvsc_media_changed(struct gendisk *gd); static int blkvsc_revalidate_disk(struct gendisk *gd); static int blkvsc_getgeo(struct block_device *bd, struct hd_geometry *hg); -static int blkvsc_ioctl(struct inode *inode, struct file *filep, unsigned cmd, unsigned long arg); - +static int blkvsc_ioctl(struct block_device *bd, fmode_t mode, + unsigned cmd, unsigned long argument); static void blkvsc_request(struct request_queue *queue); static void blkvsc_request_completion(STORVSC_REQUEST* request); static int blkvsc_do_request(struct block_device_context *blkdev, struct request *req); @@ -1451,9 +1451,9 @@ int blkvsc_getgeo(struct block_device *bd, struct hd_geometry *hg) return 0; } -static int blkvsc_ioctl(struct inode *inode, struct file *filep, unsigned cmd, unsigned long arg) +static int blkvsc_ioctl(struct block_device *bd, fmode_t mode, + unsigned cmd, unsigned long argument) { - struct block_device *bd = inode->i_bdev; struct block_device_context *blkdev = bd->bd_disk->private_data; int ret=0;