From: K. Y. Srinivasan Date: Tue, 10 May 2011 14:54:09 +0000 (-0700) Subject: Staging: hv: Cleanup blkvsc_remove() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f670f824d6a740963d506d6d47a4c1a07b61c630;p=openwrt%2Fstaging%2Fblogic.git Staging: hv: Cleanup blkvsc_remove() The function storvsc_dev_remove() already deals with draining of the outstanding I/O. Cleanup blkvsc_remove() keeping this in mind. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Abhishek Kane Signed-off-by: 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 2b27d00039f4..e6a59d753922 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c @@ -538,11 +538,6 @@ static int blkvsc_remove(struct hv_device *dev) struct block_device_context *blkdev = dev_get_drvdata(&dev->device); unsigned long flags; - /* - * Call to the vsc driver to let it know that the device is being - * removed - */ - storvsc_dev_remove(dev); /* Get to a known state */ spin_lock_irqsave(&blkdev->lock, flags); @@ -555,17 +550,16 @@ static int blkvsc_remove(struct hv_device *dev) spin_unlock_irqrestore(&blkdev->lock, flags); - while (blkdev->num_outstanding_reqs) { - DPRINT_INFO(STORVSC, "waiting for %d requests to complete...", - blkdev->num_outstanding_reqs); - udelay(100); - } - - blkvsc_do_operation(blkdev, DO_FLUSH); blk_cleanup_queue(blkdev->gd->queue); + /* + * Call to the vsc driver to let it know that the device is being + * removed + */ + storvsc_dev_remove(dev); + del_gendisk(blkdev->gd); kmem_cache_destroy(blkdev->request_pool);