Re-order the fields to avoid padding, and change the type of heap_index to uint16_t to match dns_rbtnode_t->locknum.
heap_index
uint16_t
dns_rbtnode_t->locknum