lkml.org 
[lkml]   [2011]   [Mar]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/22] Staging: hv: Get rid of the forward declaration of blkvsc_shutdown()
    Date
    Get rid of the forward declaration of blkvsc_shutdown() by moving the
    code around.

    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>
    ---
    drivers/staging/hv/blkvsc_drv.c | 70 +++++++++++++++++++--------------------
    1 files changed, 34 insertions(+), 36 deletions(-)

    diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
    index f67d983..1b05369 100644
    --- a/drivers/staging/hv/blkvsc_drv.c
    +++ b/drivers/staging/hv/blkvsc_drv.c
    @@ -642,10 +642,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);
    @@ -909,40 +941,6 @@ Cleanup:
    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)
    {
    --
    1.7.4.1


    \
     
     \ /
      Last update: 2011-03-28 18:55    [W:4.930 / U:0.272 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site