summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2009-07-27 16:47:27 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 12:01:50 -0700
commit39635f7d8de679d97e2773e6c5d2749a420bed87 (patch)
tree6e7b504aae2c357be39fba7297a334dcb9b31449
parent627c156d75582c6e678efabc64d33d4b1c66b4ce (diff)
downloadop-kernel-dev-39635f7d8de679d97e2773e6c5d2749a420bed87.zip
op-kernel-dev-39635f7d8de679d97e2773e6c5d2749a420bed87.tar.gz
Staging: hv: fix blkvsc_open() parameters
blkvsc_open() 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 8f70b40..d8a3b25 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -124,7 +124,7 @@ static int blkvsc_probe(struct device *dev);
static int blkvsc_remove(struct device *device);
static void blkvsc_shutdown(struct device *device);
-static int blkvsc_open(struct inode *inode, struct file *filep);
+static int blkvsc_open(struct block_device *bdev, fmode_t mode);
static int blkvsc_release(struct inode *inode, struct file *filep);
static int blkvsc_media_changed(struct gendisk *gd);
static int blkvsc_revalidate_disk(struct gendisk *gd);
@@ -1320,9 +1320,9 @@ static void blkvsc_request(struct request_queue *queue)
}
}
-static int blkvsc_open(struct inode *inode, struct file *filep)
+static int blkvsc_open(struct block_device *bdev, fmode_t mode)
{
- struct block_device_context *blkdev = inode->i_bdev->bd_disk->private_data;
+ struct block_device_context *blkdev = bdev->bd_disk->private_data;
DPRINT_DBG(BLKVSC_DRV, "- users %d disk %s\n", blkdev->users, blkdev->gd->disk_name);
@@ -1331,7 +1331,7 @@ static int blkvsc_open(struct inode *inode, struct file *filep)
if (!blkdev->users && blkdev->device_type == DVD_TYPE)
{
spin_unlock(&blkdev->lock);
- check_disk_change(inode->i_bdev);
+ check_disk_change(bdev);
spin_lock(&blkdev->lock);
}
OpenPOWER on IntegriCloud