[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 11/43] block: Use CAFs in block status functions
From: |
Max Reitz |
Subject: |
[PATCH v8 11/43] block: Use CAFs in block status functions |
Date: |
Tue, 1 Sep 2020 16:33:52 +0200 |
Use the child access functions in the block status inquiry functions as
appropriate.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
block/io.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/block/io.c b/block/io.c
index 01e3477a77..4ee8fe5465 100644
--- a/block/io.c
+++ b/block/io.c
@@ -2409,9 +2409,10 @@ static int coroutine_fn
bdrv_co_block_status(BlockDriverState *bs,
if (ret & (BDRV_BLOCK_DATA | BDRV_BLOCK_ZERO)) {
ret |= BDRV_BLOCK_ALLOCATED;
} else if (want_zero && bs->drv->supports_backing) {
- if (bs->backing) {
- BlockDriverState *bs2 = bs->backing->bs;
- int64_t size2 = bdrv_getlength(bs2);
+ BlockDriverState *cow_bs = bdrv_cow_bs(bs);
+
+ if (cow_bs) {
+ int64_t size2 = bdrv_getlength(cow_bs);
if (size2 >= 0 && offset >= size2) {
ret |= BDRV_BLOCK_ZERO;
@@ -2479,7 +2480,7 @@ static int coroutine_fn
bdrv_co_block_status_above(BlockDriverState *bs,
bool first = true;
assert(bs != base);
- for (p = bs; p != base; p = backing_bs(p)) {
+ for (p = bs; p != base; p = bdrv_filter_or_cow_bs(p)) {
ret = bdrv_co_block_status(p, want_zero, offset, bytes, pnum, map,
file);
if (ret < 0) {
@@ -2553,7 +2554,7 @@ int bdrv_block_status_above(BlockDriverState *bs,
BlockDriverState *base,
int bdrv_block_status(BlockDriverState *bs, int64_t offset, int64_t bytes,
int64_t *pnum, int64_t *map, BlockDriverState **file)
{
- return bdrv_block_status_above(bs, backing_bs(bs),
+ return bdrv_block_status_above(bs, bdrv_filter_or_cow_bs(bs),
offset, bytes, pnum, map, file);
}
@@ -2563,9 +2564,9 @@ int coroutine_fn bdrv_is_allocated(BlockDriverState *bs,
int64_t offset,
int ret;
int64_t dummy;
- ret = bdrv_common_block_status_above(bs, backing_bs(bs), false, offset,
- bytes, pnum ? pnum : &dummy, NULL,
- NULL);
+ ret = bdrv_common_block_status_above(bs, bdrv_filter_or_cow_bs(bs), false,
+ offset, bytes, pnum ? pnum : &dummy,
+ NULL, NULL);
if (ret < 0) {
return ret;
}
@@ -2628,7 +2629,7 @@ int bdrv_is_allocated_above(BlockDriverState *top,
break;
}
- intermediate = backing_bs(intermediate);
+ intermediate = bdrv_filter_or_cow_bs(intermediate);
}
*pnum = n;
--
2.26.2
- [PATCH v8 01/43] block: Add child access functions, (continued)
- [PATCH v8 01/43] block: Add child access functions, Max Reitz, 2020/09/01
- [PATCH v8 03/43] block: bdrv_cow_child() for bdrv_has_zero_init(), Max Reitz, 2020/09/01
- [PATCH v8 02/43] block: Add chain helper functions, Max Reitz, 2020/09/01
- [PATCH v8 04/43] block: bdrv_set_backing_hd() is about bs->backing, Max Reitz, 2020/09/01
- [PATCH v8 06/43] block: Drop bdrv_is_encrypted(), Max Reitz, 2020/09/01
- [PATCH v8 05/43] block: Include filters when freezing backing chain, Max Reitz, 2020/09/01
- [PATCH v8 07/43] block: Add bdrv_supports_compressed_writes(), Max Reitz, 2020/09/01
- [PATCH v8 08/43] throttle: Support compressed writes, Max Reitz, 2020/09/01
- [PATCH v8 09/43] copy-on-read: Support compressed writes, Max Reitz, 2020/09/01
- [PATCH v8 10/43] block: Use bdrv_filter_(bs|child) where obvious, Max Reitz, 2020/09/01
- [PATCH v8 11/43] block: Use CAFs in block status functions,
Max Reitz <=
- [PATCH v8 12/43] stream: Deal with filters, Max Reitz, 2020/09/01
- [PATCH v8 13/43] block: Use CAFs when working with backing chains, Max Reitz, 2020/09/01
- [PATCH v8 14/43] block: Use bdrv_cow_child() in bdrv_co_truncate(), Max Reitz, 2020/09/01
- [PATCH v8 15/43] block: Re-evaluate backing file handling in reopen, Max Reitz, 2020/09/01
- [PATCH v8 17/43] vmdk: Drop vmdk_co_flush(), Max Reitz, 2020/09/01
- [PATCH v8 16/43] block: Flush all children in generic code, Max Reitz, 2020/09/01
- [PATCH v8 18/43] block: Iterate over children in refresh_limits, Max Reitz, 2020/09/01
- [PATCH v8 19/43] block: Use CAFs in bdrv_refresh_filename(), Max Reitz, 2020/09/01
- [PATCH v8 20/43] block: Use CAF in bdrv_co_rw_vmstate(), Max Reitz, 2020/09/01
- [PATCH v8 21/43] block/snapshot: Fix fallback, Max Reitz, 2020/09/01