[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/14] block: Keep bdrv_check*_request()'s return va
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 14/14] block: Keep bdrv_check*_request()'s return value |
Date: |
Thu, 11 Dec 2014 14:20:53 +0100 |
Do not throw away the value returned by bdrv_check_request() and
bdrv_check_byte_request().
Fix up some coding style issues in the proximity of the affected hunks.
Signed-off-by: Max Reitz <address@hidden>
---
block.c | 35 ++++++++++++++++++++++++-----------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/block.c b/block.c
index dbc9efe..b1718b4 100644
--- a/block.c
+++ b/block.c
@@ -3073,8 +3073,10 @@ static int coroutine_fn
bdrv_co_do_preadv(BlockDriverState *bs,
if (!drv) {
return -ENOMEDIUM;
}
- if (bdrv_check_byte_request(bs, offset, bytes)) {
- return -EIO;
+
+ ret = bdrv_check_byte_request(bs, offset, bytes);
+ if (ret < 0) {
+ return ret;
}
if (bs->copy_on_read) {
@@ -3317,8 +3319,10 @@ static int coroutine_fn
bdrv_co_do_pwritev(BlockDriverState *bs,
if (bs->read_only) {
return -EACCES;
}
- if (bdrv_check_byte_request(bs, offset, bytes)) {
- return -EIO;
+
+ ret = bdrv_check_byte_request(bs, offset, bytes);
+ if (ret < 0) {
+ return ret;
}
/* throttling disk I/O */
@@ -4142,12 +4146,18 @@ int bdrv_write_compressed(BlockDriverState *bs, int64_t
sector_num,
const uint8_t *buf, int nb_sectors)
{
BlockDriver *drv = bs->drv;
- if (!drv)
+ int ret;
+
+ if (!drv) {
return -ENOMEDIUM;
- if (!drv->bdrv_write_compressed)
+ }
+ if (!drv->bdrv_write_compressed) {
return -ENOTSUP;
- if (bdrv_check_request(bs, sector_num, nb_sectors))
- return -EIO;
+ }
+ ret = bdrv_check_request(bs, sector_num, nb_sectors);
+ if (ret < 0) {
+ return ret;
+ }
assert(QLIST_EMPTY(&bs->dirty_bitmaps));
@@ -5065,12 +5075,15 @@ static void coroutine_fn bdrv_discard_co_entry(void
*opaque)
int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num,
int nb_sectors)
{
- int max_discard;
+ int max_discard, ret;
if (!bs->drv) {
return -ENOMEDIUM;
- } else if (bdrv_check_request(bs, sector_num, nb_sectors)) {
- return -EIO;
+ }
+
+ ret = bdrv_check_request(bs, sector_num, nb_sectors);
+ if (ret < 0) {
+ return ret;
} else if (bs->read_only) {
return -EROFS;
}
--
1.9.3
- [Qemu-devel] [PATCH 02/14] block: Add blk_new_open(), (continued)
- [Qemu-devel] [PATCH 02/14] block: Add blk_new_open(), Max Reitz, 2014/12/11
- [Qemu-devel] [PATCH 04/14] block/xen: Use blk_new_open() in blk_connect(), Max Reitz, 2014/12/11
- [Qemu-devel] [PATCH 05/14] qemu-img: Use blk_new_open() in img_open(), Max Reitz, 2014/12/11
- [Qemu-devel] [PATCH 06/14] qemu-img: Use blk_new_open() in img_rebase(), Max Reitz, 2014/12/11
- [Qemu-devel] [PATCH 07/14] qemu-img: Use BlockBackend as far as possible, Max Reitz, 2014/12/11
- [Qemu-devel] [PATCH 10/14] qemu-io: Remove "growable" option, Max Reitz, 2014/12/11
- [Qemu-devel] [PATCH 08/14] qemu-nbd: Use blk_new_open() in main(), Max Reitz, 2014/12/11
- [Qemu-devel] [PATCH 11/14] qemu-io: Use BlockBackend, Max Reitz, 2014/12/11
- [Qemu-devel] [PATCH 13/14] block: Remove "growable" from BDS, Max Reitz, 2014/12/11
- [Qemu-devel] [PATCH 14/14] block: Keep bdrv_check*_request()'s return value,
Max Reitz <=
- [Qemu-devel] [PATCH 09/14] qemu-io: Use blk_new_open() in openfile(), Max Reitz, 2014/12/11
- [Qemu-devel] [PATCH 03/14] blockdev: Use blk_new_open() in blockdev_init(), Max Reitz, 2014/12/11
- [Qemu-devel] [PATCH 01/14] block: Lift some BDS functions to the BlockBackend, Max Reitz, 2014/12/11
- [Qemu-devel] [PATCH 12/14] block: Clamp BlockBackend requests, Max Reitz, 2014/12/11
- Re: [Qemu-devel] [PATCH 00/14] block: Remove "growable", add blk_new_open(), Kevin Wolf, 2014/12/18