[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 3/5] block/io: bdrv_common_block_status_above: support bs == b
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v6 3/5] block/io: bdrv_common_block_status_above: support bs == base |
Date: |
Wed, 16 Sep 2020 15:20:06 +0300 |
We are going to reuse bdrv_common_block_status_above in
bdrv_is_allocated_above. bdrv_is_allocated_above may be called with
include_base == false and still bs == base (for ex. from img_rebase()).
So, support this corner case.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
block/io.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/block/io.c b/block/io.c
index 0cc2dd7a3e..d864d035ac 100644
--- a/block/io.c
+++ b/block/io.c
@@ -2371,9 +2371,13 @@ bdrv_co_common_block_status_above(BlockDriverState *bs,
BlockDriverState *p;
int64_t eof = 0;
- assert(include_base || bs != base);
assert(!include_base || base); /* Can't include NULL base */
+ if (!include_base && bs == base) {
+ *pnum = bytes;
+ return 0;
+ }
+
ret = bdrv_co_block_status(bs, want_zero, offset, bytes, pnum, map, file);
if (ret < 0 || *pnum == 0 || ret & BDRV_BLOCK_ALLOCATED || bs == base) {
return ret;
--
2.21.3
- [PATCH v6 0/5] fix & merge block_status_above and is_allocated_above, Vladimir Sementsov-Ogievskiy, 2020/09/16
- [PATCH v6 4/5] block/io: fix bdrv_is_allocated_above, Vladimir Sementsov-Ogievskiy, 2020/09/16
- [PATCH v6 1/5] block/io: fix bdrv_co_block_status_above, Vladimir Sementsov-Ogievskiy, 2020/09/16
- [PATCH v6 5/5] iotests: add commit top->base cases to 274, Vladimir Sementsov-Ogievskiy, 2020/09/16
- [PATCH v6 2/5] block/io: bdrv_common_block_status_above: support include_base, Vladimir Sementsov-Ogievskiy, 2020/09/16
- Re: [PATCH v6 2/5] block/io: bdrv_common_block_status_above: support include_base, Alberto Garcia, 2020/09/23
- [PATCH v6 3/5] block/io: bdrv_common_block_status_above: support bs == base,
Vladimir Sementsov-Ogievskiy <=