diff --git a/[refs] b/[refs] index 231e5ea92eb8..9aaf6ce7dba1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aac7af6db1aa4e0e85791f39a168decefb4b15f5 +refs/heads/master: 3880914aa68fec748e634522bd2fef448b0ea3bb diff --git a/trunk/drivers/staging/hv/blkvsc_drv.c b/trunk/drivers/staging/hv/blkvsc_drv.c index 4c248b7c9db3..b2cd04a7e060 100644 --- a/trunk/drivers/staging/hv/blkvsc_drv.c +++ b/trunk/drivers/staging/hv/blkvsc_drv.c @@ -722,22 +722,6 @@ static int blkvsc_release(struct gendisk *disk, fmode_t mode) } -static int blkvsc_revalidate_disk(struct gendisk *gd) -{ - struct block_device_context *blkdev = gd->private_data; - - DPRINT_DBG(BLKVSC_DRV, "- enter\n"); - - if (blkdev->device_type == DVD_TYPE) { - blkvsc_do_operation(blkdev, DO_CAPACITY); - set_capacity(blkdev->gd, blkdev->capacity * - (blkdev->sector_size/512)); - blk_queue_logical_block_size(gd->queue, blkdev->sector_size); - } - return 0; -} - - /* * We break the request into 1 or more blkvsc_requests and submit * them. If we cant submit them all, we put them on the @@ -997,7 +981,6 @@ static const struct block_device_operations block_ops = { .owner = THIS_MODULE, .open = blkvsc_open, .release = blkvsc_release, - .revalidate_disk = blkvsc_revalidate_disk, .getgeo = blkvsc_getgeo, .ioctl = blkvsc_ioctl, };