77d76
< size_t i;
82,85c81
< i = nbits >> LG_BITMAP_GROUP_NBITS;
< if (nbits % BITMAP_GROUP_NBITS != 0)
< i++;
< binfo->ngroups = i;
---
> binfo->ngroups = BITMAP_BITS2GROUPS(nbits);
102c98,99
< extra = (binfo->nbits % (binfo->ngroups * BITMAP_GROUP_NBITS));
---
> extra = (BITMAP_GROUP_NBITS - (binfo->nbits & BITMAP_GROUP_NBITS_MASK))
> & BITMAP_GROUP_NBITS_MASK;
104c101
< bitmap[binfo->ngroups - 1] >>= (BITMAP_GROUP_NBITS - extra);
---
> bitmap[binfo->ngroups - 1] >>= extra;