summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/fs/zfs/vdev_label.c
diff options
context:
space:
mode:
authorPaul Dagnelie <pcd@delphix.com>2019-11-25 13:53:55 -0700
committerJerry Jelinek <jerry.jelinek@joyent.com>2019-12-06 05:47:33 -0700
commit4d7988d6050abba5c1ff60e7fd196e95c22e20f4 (patch)
tree9ed1cf9af97ea9a253cd48b5649fe0b2a1beafee /usr/src/uts/common/fs/zfs/vdev_label.c
parentbb4b7f47acc2c683b79216e79167725745ca353b (diff)
downloadillumos-gate-4d7988d6050abba5c1ff60e7fd196e95c22e20f4.tar.gz
11971 Reduce loaded range tree memory usage
Portions contributed by: Jerry Jelinek <jerry.jelinek@joyent.com> Reviewed by: George Wilson <gwilson@delphix.com> Reviewed by: Matt Ahrens <matt@delphix.com> Reviewed by: Sebastien Roy seb@delphix.com Reviewed by: Igor Kozhukhov <igor@dilos.org> Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed by: Kody Kantor <kody.kantor@joyent.com> Reviewed by: Andy Fiddaman <andy@omniosce.org> Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/uts/common/fs/zfs/vdev_label.c')
-rw-r--r--usr/src/uts/common/fs/zfs/vdev_label.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/uts/common/fs/zfs/vdev_label.c b/usr/src/uts/common/fs/zfs/vdev_label.c
index 0ba8a94823..bb377f08ce 100644
--- a/usr/src/uts/common/fs/zfs/vdev_label.c
+++ b/usr/src/uts/common/fs/zfs/vdev_label.c
@@ -1021,12 +1021,12 @@ retry:
static int
vdev_uberblock_compare(const uberblock_t *ub1, const uberblock_t *ub2)
{
- int cmp = AVL_CMP(ub1->ub_txg, ub2->ub_txg);
+ int cmp = TREE_CMP(ub1->ub_txg, ub2->ub_txg);
if (likely(cmp))
return (cmp);
- cmp = AVL_CMP(ub1->ub_timestamp, ub2->ub_timestamp);
+ cmp = TREE_CMP(ub1->ub_timestamp, ub2->ub_timestamp);
if (likely(cmp))
return (cmp);
@@ -1050,7 +1050,7 @@ vdev_uberblock_compare(const uberblock_t *ub1, const uberblock_t *ub2)
if (MMP_VALID(ub2) && MMP_SEQ_VALID(ub2))
seq2 = MMP_SEQ(ub2);
- return (AVL_CMP(seq1, seq2));
+ return (TREE_CMP(seq1, seq2));
}
struct ubl_cbdata {