diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2010-05-05 15:27:42 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 14:36:14 -0400 |
commit | ee3503762d86c13bb94ed1db200d4601517b1b9b (patch) | |
tree | e1dfb75ddb7d7bda09bfefbc8233fb9f21b6b86a /drivers | |
parent | b856e7382f7d1b184a3dac200275e23a27488ce1 (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/hv/blkvsc_drv.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index 8f8637e51d9..b6a2cb8752d 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) | |||
1213 | (!comp_req->request.Status ? 0 : -EIO), | 1213 | (!comp_req->request.Status ? 0 : -EIO), |
1214 | comp_req->sector_count * | 1214 | comp_req->sector_count * |
1215 | blkdev->sector_size); | 1215 | blkdev->sector_size); |
1216 | ASSERT(ret != 0); | 1216 | |
1217 | /* FIXME: shouldn't this do more than return? */ | ||
1218 | if (ret) | ||
1219 | goto out; | ||
1217 | } | 1220 | } |
1218 | 1221 | ||
1219 | kmem_cache_free(blkdev->request_pool, comp_req); | 1222 | kmem_cache_free(blkdev->request_pool, comp_req); |
@@ -1245,6 +1248,7 @@ static int blkvsc_cancel_pending_reqs(struct block_device_context *blkdev) | |||
1245 | kmem_cache_free(blkdev->request_pool, pend_req); | 1248 | kmem_cache_free(blkdev->request_pool, pend_req); |
1246 | } | 1249 | } |
1247 | 1250 | ||
1251 | out: | ||
1248 | return ret; | 1252 | return ret; |
1249 | } | 1253 | } |
1250 | 1254 | ||