axmap: ensure that overlaps are handled strictly sequential

[fio.git] / lib / axmap.c

diff --git a/lib/axmap.c b/lib/axmap.c
index bf203dfe7b2d0ba379ee09b06a6924c3bd00fd03..c29597f80e78748043b63db3756463596c164646 100644 (file)
--- a/lib/axmap.c
+++ b/lib/axmap.c
@@ -102,7 +102,7 @@ struct axmap *axmap_new(unsigned long nr_bits)
        }
 
        axmap->nr_levels = levels;
-       axmap->levels = malloc(axmap->nr_levels * sizeof(struct axmap_level));
+       axmap->levels = calloc(axmap->nr_levels, sizeof(struct axmap_level));
        axmap->nr_bits = nr_bits;
 
        for (i = 0; i < axmap->nr_levels; i++) {
@@ -234,17 +234,18 @@ static bool axmap_set_fn(struct axmap_level *al, unsigned long offset,
        if (overlap == mask)
                return true;
 
-       while (overlap) {
-               unsigned long clear_mask = ~(1UL << ffz(~overlap));
+       if (overlap) {
+               const int __bit = ffz(~overlap);
 
-               mask &= clear_mask;
-               overlap &= clear_mask;
-               nr_bits--;
+               if (__bit == bit)
+                       return true;
+
+               nr_bits = __bit - bit;
+               mask = bit_masks[nr_bits] << bit;
        }
 
        assert(mask);
        assert(!(al->map[offset] & mask));
-               
        al->map[offset] |= mask;
 
        if (!al->level)