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) 2012, 2014 by Delphix. All rights reserved.
  */
 
 /*
  * This file contains the top half of the zfs directory structure
  * implementation. The bottom half is in zap_leaf.c.

@@ -82,11 +82,11 @@
 
         (void) dmu_buf_update_user(zap->zap_dbuf, zap, zap,
             &zap->zap_f.zap_phys, zap_evict);
 
         mutex_init(&zap->zap_f.zap_num_entries_mtx, 0, 0, 0);
-        zap->zap_f.zap_block_shift = highbit(zap->zap_dbuf->db_size) - 1;
+        zap->zap_f.zap_block_shift = highbit64(zap->zap_dbuf->db_size) - 1;
 
         zp = zap->zap_f.zap_phys;
         /*
          * explicitly zero it since it might be coming from an
          * initialized microzap

@@ -456,11 +456,11 @@
 
         l = kmem_alloc(sizeof (zap_leaf_t), KM_SLEEP);
         rw_init(&l->l_rwlock, 0, 0, 0);
         rw_enter(&l->l_rwlock, RW_WRITER);
         l->l_blkid = blkid;
-        l->l_bs = highbit(db->db_size)-1;
+        l->l_bs = highbit64(db->db_size) - 1;
         l->l_dbuf = db;
         l->l_phys = NULL;
 
         winner = dmu_buf_set_user(db, l, &l->l_phys, zap_leaf_pageout);