Remove unused code in lib/axmap.c

With the new axmap_next_free() implementation, the "first_free" cache
is no longer used.  Remove all references to it.  Also axmap_clear()
is never referenced, so remove it and related code.

diff --git a/lib/axmap.c b/lib/axmap.c
index 8ffff9bf433f1df91a454e1e935b8c8d9f034c09..923aae403085ac0cb1ee2efe48aef5b0207de651 100644 (file)
--- a/lib/axmap.c
+++ b/lib/axmap.c
@@ -35,8 +35,6 @@
 #define BLOCKS_PER_UNIT                (1U << UNIT_SHIFT)
 #define BLOCKS_PER_UNIT_MASK   (BLOCKS_PER_UNIT - 1)
 
-#define firstfree_valid(b)     ((b)->first_free != (uint64_t) -1)
-
 static const unsigned long bit_masks[] = {
        0x0000000000000000, 0x0000000000000001, 0x0000000000000003, 0x0000000000000007,
        0x000000000000000f, 0x000000000000001f, 0x000000000000003f, 0x000000000000007f,
@@ -68,7 +66,6 @@ struct axmap_level {
 struct axmap {
        unsigned int nr_levels;
        struct axmap_level *levels;
-       uint64_t first_free;
        uint64_t nr_bits;
 };
 
@@ -89,8 +86,6 @@ void axmap_reset(struct axmap *axmap)
 
                memset(al->map, 0, al->map_size * sizeof(unsigned long));
        }
-
-       axmap->first_free = 0;
 }
 
 void axmap_free(struct axmap *axmap)
@@ -192,24 +187,6 @@ static bool axmap_handler_topdown(struct axmap *axmap, uint64_t bit_nr,
        return false;
 }
 
-static bool axmap_clear_fn(struct axmap_level *al, unsigned long offset,
-                          unsigned int bit, void *unused)
-{
-       if (!(al->map[offset] & (1UL << bit)))
-               return true;
-
-       al->map[offset] &= ~(1UL << bit);
-       return false;
-}
-
-void axmap_clear(struct axmap *axmap, uint64_t bit_nr)
-{
-       axmap_handler(axmap, bit_nr, axmap_clear_fn, NULL);
-
-       if (bit_nr < axmap->first_free)
-               axmap->first_free = bit_nr;
-}
-
 struct axmap_set_data {
        unsigned int nr_bits;
        unsigned int set_bits;
@@ -262,10 +239,6 @@ static void __axmap_set(struct axmap *axmap, uint64_t bit_nr,
 {
        unsigned int set_bits, nr_bits = data->nr_bits;
 
-       if (axmap->first_free >= bit_nr &&
-           axmap->first_free < bit_nr + data->nr_bits)
-               axmap->first_free = -1ULL;
-
        if (bit_nr > axmap->nr_bits)
                return;
        else if (bit_nr + nr_bits > axmap->nr_bits)

diff --git a/lib/axmap.h b/lib/axmap.h
index a7a6f9429b8163e5c5d239a402d1d9aabd83ce63..55349d8731f2e4edfcc01f7aad025e309782acf6 100644 (file)
--- a/lib/axmap.h
+++ b/lib/axmap.h
@@ -8,7 +8,6 @@ struct axmap;
 struct axmap *axmap_new(unsigned long nr_bits);
 void axmap_free(struct axmap *bm);
 
-void axmap_clear(struct axmap *axmap, uint64_t bit_nr);
 void axmap_set(struct axmap *axmap, uint64_t bit_nr);
 unsigned int axmap_set_nr(struct axmap *axmap, uint64_t bit_nr, unsigned int nr_bits);
 bool axmap_isset(struct axmap *axmap, uint64_t bit_nr);