summaryrefslogtreecommitdiffstats
path: root/drivers/staging/hv/blkvsc_drv.c
diff options
context:
space:
mode:
authorK. Y. Srinivasan <kys@microsoft.com>2011-05-10 07:54:09 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-11 13:39:01 -0700
commitf670f824d6a740963d506d6d47a4c1a07b61c630 (patch)
tree7a5fcfed09d877143149252d16c3fef84a159eb5 /drivers/staging/hv/blkvsc_drv.c
parent19fc2f2ae48d98690a55187b62497e83992d60fc (diff)
downloadop-kernel-dev-f670f824d6a740963d506d6d47a4c1a07b61c630.zip
op-kernel-dev-f670f824d6a740963d506d6d47a4c1a07b61c630.tar.gz
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 <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Abhishek Kane <v-abkane@microsoft.com> Signed-off-by: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/blkvsc_drv.c')
-rw-r--r--drivers/staging/hv/blkvsc_drv.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index 2b27d00..e6a59d7 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);
OpenPOWER on IntegriCloud