[PULL,16/19] bitmap: Update count after a merge

Commit Message

John Snow Oct. 29, 2018, 9:24 p.m. UTC

From: Eric Blake <[e-mail]>

We need an accurate count of the number of bits set in a bitmap
after a merge. In particular, since the merge operation short-circuits
a merge from an empty source, if you have bitmaps A, B, and C where
B started empty, then merge C into B, and B into A, an inaccurate
count meant that A did not get the contents of C.

In the worst case, we may falsely regard the bitmap as empty when
it has had new writes merged into it.

Fixes: be58721db
CC: [e-mail]
Signed-off-by: Eric Blake <[e-mail]>
Signed-off-by: John Snow <[e-mail]>
Reviewed-by: Vladimir Sementsov-Ogievskiy <[e-mail]>
Message-id: [e-mail]
Signed-off-by: John Snow <[e-mail]>
---
 util/hbitmap.c | 3 +++
 1 file changed, 3 insertions(+)

Patch

diff --git a/util/hbitmap.c b/util/hbitmap.c
index d5aca5159f..8d402c59d9 100644
--- a/util/hbitmap.c
+++ b/util/hbitmap.c
@@ -759,6 +759,9 @@  bool hbitmap_merge(const HBitmap *a, const HBitmap *b, HBitmap *result)
         }
     }
 
+    /* Recompute the dirty count */
+    result->count = hb_count_between(result, 0, result->size - 1);
+
     return true;
 }