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>

@@ -21,11 +21,11 @@
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 /*
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/zfs_context.h>
 #include <sys/spa.h>
 #include <sys/dmu.h>

@@ -265,11 +265,11 @@
                  * caveat is that the new block sizes must be a
                  * power of 2 so that old software can append to the file,
                  * adding more blocks. The block size can grow until it
                  * reaches space_map_max_blksz.
                  */
-                newsz = ISP2(size) ? size : 1ULL << highbit(size);
+                newsz = ISP2(size) ? size : 1ULL << highbit64(size);
                 if (newsz > space_map_max_blksz)
                         newsz = space_map_max_blksz;
 
                 VERIFY0(dmu_object_set_blocksize(sm->sm_os,
                     space_map_object(sm), newsz, 0, tx));