diff --git a/[refs] b/[refs] index ae730fad331a..3c8fda400f47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2b9d24eafd4785e5a07924cdb5a37867bda4620 +refs/heads/master: c4c58c583c1e21adc2b04316170c4fc355ab0123 diff --git a/trunk/drivers/staging/hv/blkvsc_drv.c b/trunk/drivers/staging/hv/blkvsc_drv.c index 3060babedaba..bf8647e40897 100644 --- a/trunk/drivers/staging/hv/blkvsc_drv.c +++ b/trunk/drivers/staging/hv/blkvsc_drv.c @@ -255,20 +255,12 @@ static int blkvsc_open(struct block_device *bdev, fmode_t mode) { struct block_device_context *blkdev = bdev->bd_disk->private_data; - - mutex_lock(&blkvsc_mutex); spin_lock(&blkdev->lock); - if (!blkdev->users && blkdev->device_type == DVD_TYPE) { - spin_unlock(&blkdev->lock); - check_disk_change(bdev); - spin_lock(&blkdev->lock); - } - blkdev->users++; spin_unlock(&blkdev->lock); - mutex_unlock(&blkvsc_mutex); + return 0; }