diff options
| author | Fiona Ebner <f.ebner@proxmox.com> | 2024-03-22 10:50:08 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2024-03-26 14:21:26 +0100 |
| commit | bac09b093ebbb79e6a7444c7b979c32ca5540132 (patch) | |
| tree | eb59a2b371af5aafe652e59401abd5551cd1d683 | |
| parent | f6d38c9f6dae6fce99dcaf6ca16a1fe5b5e19c4c (diff) | |
| download | qemu-bac09b093ebbb79e6a7444c7b979c32ca5540132.zip qemu-bac09b093ebbb79e6a7444c7b979c32ca5540132.tar.gz qemu-bac09b093ebbb79e6a7444c7b979c32ca5540132.tar.bz2 | |
block-backend: fix edge case in bdrv_next_cleanup() where BDS associated to BB changes
Same rationale as for commit "block-backend: fix edge case in
bdrv_next() where BDS associated to BB changes". The block graph might
change between the bdrv_next() call and the bdrv_next_cleanup() call,
so it could be that the associated BDS is not the same that was
referenced previously anymore. Instead, rely on bdrv_next() to set
it->bs to the BDS it referenced and unreference that one in any case.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
Message-ID: <20240322095009.346989-4-f.ebner@proxmox.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/block-backend.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/block/block-backend.c b/block/block-backend.c index 28af1eb..db6f9b9 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -663,13 +663,10 @@ void bdrv_next_cleanup(BdrvNextIterator *it) /* Must be called from the main loop */ assert(qemu_get_current_aio_context() == qemu_get_aio_context()); - if (it->phase == BDRV_NEXT_BACKEND_ROOTS) { - if (it->blk) { - bdrv_unref(blk_bs(it->blk)); - blk_unref(it->blk); - } - } else { - bdrv_unref(it->bs); + bdrv_unref(it->bs); + + if (it->phase == BDRV_NEXT_BACKEND_ROOTS && it->blk) { + blk_unref(it->blk); } bdrv_next_reset(it); |