Print this page
4374 dn_free_ranges should use range_tree_t
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Max Grossman <max.grossman@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Dan McDonald <danmcd@omniti.com>

@@ -18,11 +18,11 @@
  *
  * CDDL HEADER END
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2014 by Delphix. All rights reserved.
  */
 
 /*
  * The 512-byte leaf is broken into 32 16-byte chunks.
  * chunk number n means l_chunk[n], even though the header precedes it.

@@ -103,11 +103,11 @@
 void
 zap_leaf_byteswap(zap_leaf_phys_t *buf, int size)
 {
         int i;
         zap_leaf_t l;
-        l.l_bs = highbit(size)-1;
+        l.l_bs = highbit64(size) - 1;
         l.l_phys = buf;
 
         buf->l_hdr.lh_block_type =      BSWAP_64(buf->l_hdr.lh_block_type);
         buf->l_hdr.lh_prefix =          BSWAP_64(buf->l_hdr.lh_prefix);
         buf->l_hdr.lh_magic =           BSWAP_32(buf->l_hdr.lh_magic);

@@ -155,11 +155,11 @@
 void
 zap_leaf_init(zap_leaf_t *l, boolean_t sort)
 {
         int i;
 
-        l->l_bs = highbit(l->l_dbuf->db_size)-1;
+        l->l_bs = highbit64(l->l_dbuf->db_size) - 1;
         zap_memset(&l->l_phys->l_hdr, 0, sizeof (struct zap_leaf_header));
         zap_memset(l->l_phys->l_hash, CHAIN_END, 2*ZAP_LEAF_HASH_NUMENTRIES(l));
         for (i = 0; i < ZAP_LEAF_NUMCHUNKS(l); i++) {
                 ZAP_LEAF_CHUNK(l, i).l_free.lf_type = ZAP_CHUNK_FREE;
                 ZAP_LEAF_CHUNK(l, i).l_free.lf_next = i+1;