From: Bill Pemberton <wfp5p@virginia.edu>
Date: Wed, 5 May 2010 19:27:42 +0000 (-0400)
Subject: staging: hv: return error instead calling ASSERT in blkvsc_drv.c
X-Git-Tag: MMI-PSA29.97-13-9~23841^2^2~165
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ee3503762d86c13bb94ed1db200d4601517b1b9b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

staging: hv: return error instead calling ASSERT in blkvsc_drv.c

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index 8f8637e51d9e..b6a2cb8752d3 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -1213,7 +1213,10 @@ static int blkvsc_cancel_pending_reqs(struct block_device_context *blkdev)
 					(!comp_req->request.Status ? 0 : -EIO),
 					comp_req->sector_count *
 					blkdev->sector_size);
-				ASSERT(ret != 0);
+
+				/* FIXME: shouldn't this do more than return? */
+				if (ret)
+					goto out;
 			}
 
 			kmem_cache_free(blkdev->request_pool, comp_req);
@@ -1245,6 +1248,7 @@ static int blkvsc_cancel_pending_reqs(struct block_device_context *blkdev)
 		kmem_cache_free(blkdev->request_pool, pend_req);
 	}
 
+out:
 	return ret;
 }