summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2010-05-05 15:27:42 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-11 11:36:14 -0700
commitee3503762d86c13bb94ed1db200d4601517b1b9b (patch)
treee1dfb75ddb7d7bda09bfefbc8233fb9f21b6b86a
parentb856e7382f7d1b184a3dac200275e23a27488ce1 (diff)
downloadlinux-3.10-ee3503762d86c13bb94ed1db200d4601517b1b9b.tar.gz
linux-3.10-ee3503762d86c13bb94ed1db200d4601517b1b9b.tar.bz2
linux-3.10-ee3503762d86c13bb94ed1db200d4601517b1b9b.zip
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>
-rw-r--r--drivers/staging/hv/blkvsc_drv.c6
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)
(!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;
}