Commit 8c090044 authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman
Browse files

Staging: hv: Get rid of the forward declaration of blkvsc_remove() 



Get rid of the forward declaration of blkvsc_remove() by moving the code around.

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarAbhishek Kane <v-abkane@microsoft.com>
Signed-off-by: default avatarHank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f60f2138

drivers/staging/hv/blkvsc_drv.c

+65 −65
Original line number Diff line number Diff line
@@ -572,9 +572,73 @@ static int blkvsc_cancel_pending_reqs(struct block_device_context *blkdev) 
	return ret;

}





/*

 * blkvsc_remove() - Callback when our device is removed

 */

static int blkvsc_remove(struct device *device)

{

	struct hv_driver *drv =

				drv_to_hv_drv(device->driver);

	struct storvsc_driver_object *storvsc_drv_obj =

				drv->priv;

	struct hv_device *device_obj = device_to_hv_device(device);

	struct block_device_context *blkdev = dev_get_drvdata(device);

	unsigned long flags;

	int ret;



	DPRINT_DBG(BLKVSC_DRV, "blkvsc_remove()\n");



	if (!storvsc_drv_obj->base.dev_rm)

		return -1;



	/*

	 * Call to the vsc driver to let it know that the device is being

	 * removed

	 */

	ret = storvsc_drv_obj->base.dev_rm(device_obj);

	if (ret != 0) {

		/* TODO: */

		DPRINT_ERR(BLKVSC_DRV,

			   "unable to remove blkvsc device (ret %d)", ret);

	}



	/* Get to a known state */

	spin_lock_irqsave(&blkdev->lock, flags);



	blkdev->shutting_down = 1;



	blk_stop_queue(blkdev->gd->queue);



	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_flush(blkdev);



	spin_lock_irqsave(&blkdev->lock, flags);



	blkvsc_cancel_pending_reqs(blkdev);



	spin_unlock_irqrestore(&blkdev->lock, flags);



	blk_cleanup_queue(blkdev->gd->queue);



	del_gendisk(blkdev->gd);



	kmem_cache_destroy(blkdev->request_pool);



	kfree(blkdev);



	return ret;

}



/* Static decl */

static int blkvsc_probe(struct device *dev);

static int blkvsc_remove(struct device *device);

static void blkvsc_shutdown(struct device *device);



static int blkvsc_release(struct gendisk *disk, fmode_t mode);
@@ -1110,70 +1174,6 @@ static int blkvsc_do_read_capacity16(struct block_device_context *blkdev) 
	return 0;

}



/*

 * blkvsc_remove() - Callback when our device is removed

 */

static int blkvsc_remove(struct device *device)

{

	struct hv_driver *drv =

				drv_to_hv_drv(device->driver);

	struct storvsc_driver_object *storvsc_drv_obj =

				drv->priv;

	struct hv_device *device_obj = device_to_hv_device(device);

	struct block_device_context *blkdev = dev_get_drvdata(device);

	unsigned long flags;

	int ret;



	DPRINT_DBG(BLKVSC_DRV, "blkvsc_remove()\n");



	if (!storvsc_drv_obj->base.dev_rm)

		return -1;



	/*

	 * Call to the vsc driver to let it know that the device is being

	 * removed

	 */

	ret = storvsc_drv_obj->base.dev_rm(device_obj);

	if (ret != 0) {

		/* TODO: */

		DPRINT_ERR(BLKVSC_DRV,

			   "unable to remove blkvsc device (ret %d)", ret);

	}



	/* Get to a known state */

	spin_lock_irqsave(&blkdev->lock, flags);



	blkdev->shutting_down = 1;



	blk_stop_queue(blkdev->gd->queue);



	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_flush(blkdev);



	spin_lock_irqsave(&blkdev->lock, flags);



	blkvsc_cancel_pending_reqs(blkdev);



	spin_unlock_irqrestore(&blkdev->lock, flags);



	blk_cleanup_queue(blkdev->gd->queue);



	del_gendisk(blkdev->gd);



	kmem_cache_destroy(blkdev->request_pool);



	kfree(blkdev);



	return ret;

}



/*

 * We break the request into 1 or more blkvsc_requests and submit

 * them.  If we can't submit them all, we put them on the