Re: [PATCH 4/4] block: simplify handling of try to merge different sized bitmaps

[Vladimir Sementsov-Ogievskiy]

15.02.2022 20:53, Vladimir Sementsov-Ogievskiy wrote:
> diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
> index d16b96ee62..9d803fcda3 100644
> --- a/block/dirty-bitmap.c
> +++ b/block/dirty-bitmap.c
> @@ -309,10 +309,7 @@ BdrvDirtyBitmap 
> *bdrv_reclaim_dirty_bitmap_locked(BdrvDirtyBitmap *parent,
>           return NULL;
>       }
>   
> -    if (!hbitmap_merge(parent->bitmap, successor->bitmap, parent->bitmap)) {
> -        error_setg(errp, "Merging of parent and successor bitmap failed");
> -        return NULL;
> -    }
> +    hbitmap_merge(parent->bitmap, successor->bitmap, parent->bitmap);
>   
>       parent->disabled = successor->disabled;
>       parent->busy = false;
> @@ -899,13 +896,14 @@ bool bdrv_merge_dirty_bitmap(BdrvDirtyBitmap *dest, const 
> BdrvDirtyBitmap *src,
>           goto out;
>       }
>   
> -    if (!hbitmap_can_merge(dest->bitmap, src->bitmap)) {
> -        error_setg(errp, "Bitmaps are incompatible and can't be merged");
> +    if (bdrv_dirty_bitmap_size(src) != bdrv_dirty_bitmap_size(dest)) {
> +        error_setg(errp, "Bitmaps are of different sizes (destination size is 
> %"
> +                   PRId64 ", source size is %" PRId64 ") and can't be merged",
> +                   bdrv_dirty_bitmap_size(dest), bdrv_dirty_bitmap_size(src));
>           goto out;
>       }
>   
> -    ret = bdrv_dirty_bitmap_merge_internal(dest, src, backup, false);
> -    assert(ret);
> +    bdrv_dirty_bitmap_merge_internal(dest, src, backup, false);

bug here: actually we still should set ret to true: it's a return status which 
we are going to return to the caller!

>   
>   out:
>       bdrv_dirty_bitmaps_unlock(dest->bs);



--
Best regards,
Vladimir