summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2009-07-27 16:47:29 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 12:01:50 -0700
commitdfe8b2d9d809fef5df24280e1e275fcd30776bd5 (patch)
tree5fc644a716cbc377f986ef33413de4d4d72ee708
parent77d2d9da7c74678b69170485909e63ff21e4af07 (diff)
downloadop-kernel-dev-dfe8b2d9d809fef5df24280e1e275fcd30776bd5.zip
op-kernel-dev-dfe8b2d9d809fef5df24280e1e275fcd30776bd5.tar.gz
Staging: hv: fix blkvsc_ioctl() parameters
blkvsc_ioctl() had the wrong parameter list for struct block_device_operations Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/hv/blkvsc_drv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index 4bf77ee..5322e57 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;
OpenPOWER on IntegriCloud