Commit e82066b2 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_shutdown() 



Get rid of the forward declaration of blkvsc_shutdown() 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 8c090044

drivers/staging/hv/blkvsc_drv.c

+34 −36
Original line number Diff line number Diff line
@@ -637,10 +637,42 @@ static int blkvsc_remove(struct device *device) 
	return ret;

}



static void blkvsc_shutdown(struct device *device)

{

	struct block_device_context *blkdev = dev_get_drvdata(device);

	unsigned long flags;



	if (!blkdev)

		return;



	DPRINT_DBG(BLKVSC_DRV, "blkvsc_shutdown - users %d disk %s\n",

		   blkdev->users, blkdev->gd->disk_name);



	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);

}



/* Static decl */

static int blkvsc_probe(struct device *dev);

static void blkvsc_shutdown(struct device *device);



static int blkvsc_release(struct gendisk *disk, fmode_t mode);

static int blkvsc_revalidate_disk(struct gendisk *gd);

static void blkvsc_request(struct request_queue *queue);
@@ -904,40 +936,6 @@ static int blkvsc_probe(struct device *device) 
	return ret;

}



static void blkvsc_shutdown(struct device *device)

{

	struct block_device_context *blkdev = dev_get_drvdata(device);

	unsigned long flags;



	if (!blkdev)

		return;



	DPRINT_DBG(BLKVSC_DRV, "blkvsc_shutdown - users %d disk %s\n",

		   blkdev->users, blkdev->gd->disk_name);



	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);

}



/* Do a scsi INQUIRY cmd here to get the device type (ie disk or dvd) */

static int blkvsc_do_inquiry(struct block_device_context *blkdev)

{