mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 18:40:43 +03:00
Illumos #4374
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> References: https://www.illumos.org/issues/4374 https://github.com/illumos/illumos-gate/commit/bf16b11 Ported by: Tim Chase <tim@chase2k.com> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #2531
This commit is contained in:
committed by
Brian Behlendorf
parent
da536844d5
commit
9bd274ddd8
+3
-2
@@ -21,7 +21,7 @@
|
||||
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
@@ -2788,7 +2788,8 @@ dump_simulated_ddt(spa_t *spa)
|
||||
dds.dds_ref_psize = zdde->zdde_ref_psize;
|
||||
dds.dds_ref_dsize = zdde->zdde_ref_dsize;
|
||||
|
||||
ddt_stat_add(&ddh_total.ddh_stat[highbit(refcnt) - 1], &dds, 0);
|
||||
ddt_stat_add(&ddh_total.ddh_stat[highbit64(refcnt) - 1],
|
||||
&dds, 0);
|
||||
|
||||
umem_free(zdde, sizeof (*zdde));
|
||||
}
|
||||
|
||||
@@ -740,7 +740,7 @@ make_leaf_vdev(nvlist_t *props, const char *arg, uint64_t is_log)
|
||||
int sector_size;
|
||||
|
||||
if (check_sector_size_database(path, §or_size) == B_TRUE)
|
||||
ashift = highbit(sector_size) - 1;
|
||||
ashift = highbit64(sector_size) - 1;
|
||||
}
|
||||
|
||||
if (ashift > 0)
|
||||
|
||||
Reference in New Issue
Block a user