From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Fabian Ebner Date: Thu, 23 Jun 2022 14:00:07 +0200 Subject: [PATCH] Revert "block/rbd: fix handling of holes in .bdrv_co_block_status" This reverts commit 9e302f64bb407a9bb097b626da97228c2654cfee in preparation to revert 0347a8fd4c3faaedf119be04c197804be40a384b. Signed-off-by: Fabian Ebner --- block/rbd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index 9fc6dcb957..98f4ba2620 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -1307,11 +1307,11 @@ static int qemu_rbd_diff_iterate_cb(uint64_t offs, size_t len, RBDDiffIterateReq *req = opaque; assert(req->offs + req->bytes <= offs); - - /* treat a hole like an unallocated area and bail out */ - if (!exists) { - return 0; - } + /* + * we do not diff against a snapshot so we should never receive a callback + * for a hole. + */ + assert(exists); if (!req->exists && offs > req->offs) { /*