From 4d7988d6050abba5c1ff60e7fd196e95c22e20f4 Mon Sep 17 00:00:00 2001 From: Paul Dagnelie Date: Mon, 25 Nov 2019 13:53:55 -0700 Subject: 11971 Reduce loaded range tree memory usage Portions contributed by: Jerry Jelinek Reviewed by: George Wilson Reviewed by: Matt Ahrens Reviewed by: Sebastien Roy seb@delphix.com Reviewed by: Igor Kozhukhov Reviewed by: Brian Behlendorf Reviewed by: Kody Kantor Reviewed by: Andy Fiddaman Approved by: Dan McDonald --- usr/src/uts/common/fs/zfs/vdev_label.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'usr/src/uts/common/fs/zfs/vdev_label.c') 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 { -- cgit v1.2.3