From b51507ddd82d145e8d8f1d18f509c3cdb2e26ada Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Tue, 10 May 2011 07:53:49 -0700 Subject: [PATCH] --- yaml --- r: 249445 b: refs/heads/master c: 67de49c15480afd50b86f0cf18af82616974a5a9 h: refs/heads/master i: 249443: 297ffa601bd8725b17d8978fcba40c493da6ce91 v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/blkvsc_drv.c | 31 +++++++++++++-------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index f40f462781dc..4f253a699b2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b73e4c06d326571589eebcb78efde6182330042 +refs/heads/master: 67de49c15480afd50b86f0cf18af82616974a5a9 diff --git a/trunk/drivers/staging/hv/blkvsc_drv.c b/trunk/drivers/staging/hv/blkvsc_drv.c index 74d51bb78701..8a577bc849e5 100644 --- a/trunk/drivers/staging/hv/blkvsc_drv.c +++ b/trunk/drivers/staging/hv/blkvsc_drv.c @@ -331,10 +331,14 @@ static void blkvsc_cmd_completion(struct hv_storvsc_request *request) (struct block_device_context *)blkvsc_req->dev; struct scsi_sense_hdr sense_hdr; struct vmscsi_request *vm_srb; + unsigned long flags; vm_srb = &blkvsc_req->request.vstor_packet.vm_srb; + + spin_lock_irqsave(&blkdev->lock, flags); blkdev->num_outstanding_reqs--; + spin_unlock_irqrestore(&blkdev->lock, flags); if (vm_srb->scsi_status) if (scsi_normalize_sense(blkvsc_req->sense_buffer, @@ -354,6 +358,7 @@ static int blkvsc_do_operation(struct block_device_context *blkdev, unsigned char device_type; struct scsi_sense_hdr sense_hdr; struct vmscsi_request *vm_srb; + unsigned long flags; int ret = 0; @@ -407,7 +412,9 @@ static int blkvsc_do_operation(struct block_device_context *blkdev, goto cleanup; } + spin_lock_irqsave(&blkdev->lock, flags); blkvsc_submit_request(blkvsc_req, blkvsc_cmd_completion); + spin_unlock_irqrestore(&blkdev->lock, flags); wait_for_completion_interruptible(&blkvsc_req->request.wait_event); @@ -555,6 +562,8 @@ static int blkvsc_remove(struct hv_device *dev) blk_stop_queue(blkdev->gd->queue); + blkvsc_cancel_pending_reqs(blkdev); + spin_unlock_irqrestore(&blkdev->lock, flags); while (blkdev->num_outstanding_reqs) { @@ -563,13 +572,8 @@ static int blkvsc_remove(struct hv_device *dev) udelay(100); } - blkvsc_do_operation(blkdev, DO_FLUSH); - - spin_lock_irqsave(&blkdev->lock, flags); - blkvsc_cancel_pending_reqs(blkdev); - - spin_unlock_irqrestore(&blkdev->lock, flags); + blkvsc_do_operation(blkdev, DO_FLUSH); blk_cleanup_queue(blkdev->gd->queue); @@ -597,6 +601,8 @@ static void blkvsc_shutdown(struct hv_device *dev) blk_stop_queue(blkdev->gd->queue); + blkvsc_cancel_pending_reqs(blkdev); + spin_unlock_irqrestore(&blkdev->lock, flags); while (blkdev->num_outstanding_reqs) { @@ -605,13 +611,9 @@ static void blkvsc_shutdown(struct hv_device *dev) udelay(100); } - blkvsc_do_operation(blkdev, DO_FLUSH); - spin_lock_irqsave(&blkdev->lock, flags); - - blkvsc_cancel_pending_reqs(blkdev); + blkvsc_do_operation(blkdev, DO_FLUSH); - spin_unlock_irqrestore(&blkdev->lock, flags); } static int blkvsc_release(struct gendisk *disk, fmode_t mode) @@ -619,16 +621,14 @@ static int blkvsc_release(struct gendisk *disk, fmode_t mode) struct block_device_context *blkdev = disk->private_data; unsigned long flags; - spin_lock_irqsave(&blkdev->lock, flags); if (blkdev->users == 1) { - spin_unlock_irqrestore(&blkdev->lock, flags); blkvsc_do_operation(blkdev, DO_FLUSH); - spin_lock_irqsave(&blkdev->lock, flags); } + spin_lock_irqsave(&blkdev->lock, flags); blkdev->users--; - spin_unlock_irqrestore(&blkdev->lock, flags); + return 0; } @@ -943,7 +943,6 @@ static int blkvsc_probe(struct hv_device *dev) struct storvsc_major_info major_info; int ret = 0; - blkdev = kzalloc(sizeof(struct block_device_context), GFP_KERNEL); if (!blkdev) { ret = -ENOMEM;