diff options
| author | Matthew Ahrens <[email protected]> | 2014-04-15 19:40:22 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-07-30 09:20:35 -0700 |
| commit | 9bd274ddd846cd4024ebe3253c7b2d4f3b6f9dc0 (patch) | |
| tree | 81da771b7588f8585fca225f38a32f605a3486a1 /cmd | |
| parent | da536844d55b2f3aaefdaebd36fb97bb867494aa (diff) | |
Illumos #4374
4374 dn_free_ranges should use range_tree_t
Reviewed by: George Wilson <[email protected]>
Reviewed by: Max Grossman <[email protected]>
Reviewed by: Christopher Siden <[email protected]
Reviewed by: Garrett D'Amore <[email protected]>
Reviewed by: Dan McDonald <[email protected]>
Approved by: Dan McDonald <[email protected]>
References:
https://www.illumos.org/issues/4374
https://github.com/illumos/illumos-gate/commit/bf16b11
Ported by: Tim Chase <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #2531
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/zdb/zdb.c | 5 | ||||
| -rw-r--r-- | cmd/zpool/zpool_vdev.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c index b29cddb6e..66b91cd97 100644 --- a/cmd/zdb/zdb.c +++ b/cmd/zdb/zdb.c @@ -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)); } diff --git a/cmd/zpool/zpool_vdev.c b/cmd/zpool/zpool_vdev.c index 31ee78c86..686782b07 100644 --- a/cmd/zpool/zpool_vdev.c +++ b/cmd/zpool/zpool_vdev.c @@ -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) |