From 19d48eac68b1762eee7108d83aedecd89a932902 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczleweli@nabijaczleweli.xyz>
Date: Thu, 3 Jun 2021 23:34:27 +0200
Subject: [PATCH] libefi: remove efi_auto_sense()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It's present (but undocumented) in the illumos gate and used exclusively
by rmformat(1) (which I recommend as a nice blast from the past),
and also the math assumes 512B sectors and is therefore wrong

Reviewed-by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #12191
---
 include/sys/efi_partition.h     |   1 -
 lib/libefi/rdwr_efi.c           |  54 --
 lib/libzfs_core/libzfs_core.abi | 890 ++++++++++++++++----------------
 3 files changed, 442 insertions(+), 503 deletions(-)

diff --git a/include/sys/efi_partition.h b/include/sys/efi_partition.h
index 88bdfd2b1ca3..fbb58013e22a 100644
--- a/include/sys/efi_partition.h
+++ b/include/sys/efi_partition.h
@@ -370,7 +370,6 @@ extern	int	efi_rescan(int);
 extern	void	efi_free(struct dk_gpt *);
 extern	int	efi_type(int);
 extern	void	efi_err_check(struct dk_gpt *);
-extern	int	efi_auto_sense(int fd, struct dk_gpt **);
 extern	int	efi_use_whole_disk(int fd);
 #endif
 
diff --git a/lib/libefi/rdwr_efi.c b/lib/libefi/rdwr_efi.c
index 1e022cc8eeaa..39b3509a5c4b 100644
--- a/lib/libefi/rdwr_efi.c
+++ b/lib/libefi/rdwr_efi.c
@@ -1692,57 +1692,3 @@ efi_err_check(struct dk_gpt *vtoc)
 		    "no reserved partition found\n");
 	}
 }
-
-/*
- * We need to get information necessary to construct a *new* efi
- * label type
- */
-int
-efi_auto_sense(int fd, struct dk_gpt **vtoc)
-{
-
-	int	i;
-
-	/*
-	 * Now build the default partition table
-	 */
-	if (efi_alloc_and_init(fd, EFI_NUMPAR, vtoc) != 0) {
-		if (efi_debug) {
-			(void) fprintf(stderr, "efi_alloc_and_init failed.\n");
-		}
-		return (-1);
-	}
-
-	for (i = 0; i < MIN((*vtoc)->efi_nparts, V_NUMPAR); i++) {
-		(*vtoc)->efi_parts[i].p_tag = default_vtoc_map[i].p_tag;
-		(*vtoc)->efi_parts[i].p_flag = default_vtoc_map[i].p_flag;
-		(*vtoc)->efi_parts[i].p_start = 0;
-		(*vtoc)->efi_parts[i].p_size = 0;
-	}
-	/*
-	 * Make constants first
-	 * and variable partitions later
-	 */
-
-	/* root partition - s0 128 MB */
-	(*vtoc)->efi_parts[0].p_start = 34;
-	(*vtoc)->efi_parts[0].p_size = 262144;
-
-	/* partition - s1  128 MB */
-	(*vtoc)->efi_parts[1].p_start = 262178;
-	(*vtoc)->efi_parts[1].p_size = 262144;
-
-	/* partition -s2 is NOT the Backup disk */
-	(*vtoc)->efi_parts[2].p_tag = V_UNASSIGNED;
-
-	/* partition -s6 /usr partition - HOG */
-	(*vtoc)->efi_parts[6].p_start = 524322;
-	(*vtoc)->efi_parts[6].p_size = (*vtoc)->efi_last_u_lba - 524322
-	    - (1024 * 16);
-
-	/* efi reserved partition - s9 16K */
-	(*vtoc)->efi_parts[8].p_start = (*vtoc)->efi_last_u_lba - (1024 * 16);
-	(*vtoc)->efi_parts[8].p_size = (1024 * 16);
-	(*vtoc)->efi_parts[8].p_tag = V_RESERVED;
-	return (0);
-}
diff --git a/lib/libzfs_core/libzfs_core.abi b/lib/libzfs_core/libzfs_core.abi
index 8d7af37b7a0f..3d5bc55a4633 100644
--- a/lib/libzfs_core/libzfs_core.abi
+++ b/lib/libzfs_core/libzfs_core.abi
@@ -152,7 +152,6 @@
     <elf-symbol name='avl_walk' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='efi_alloc_and_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='efi_alloc_and_read' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='efi_auto_sense' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='efi_err_check' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='efi_free' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='efi_rescan' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -374,48 +373,37 @@
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-23'/>
     <var-decl name='default_vtoc_map' type-id='type-id-9' mangled-name='default_vtoc_map' visibility='default' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='146' column='1' elf-symbol-id='default_vtoc_map'/>
     <var-decl name='efi_debug' type-id='type-id-4' mangled-name='efi_debug' visibility='default' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='177' column='1' elf-symbol-id='efi_debug'/>
-    <function-decl name='efi_alloc_and_read' mangled-name='efi_alloc_and_read' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='446' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_alloc_and_read'>
-      <parameter type-id='type-id-4' name='fd' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='446' column='1'/>
-      <parameter type-id='type-id-24' name='vtoc' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='446' column='1'/>
+    <function-decl name='efi_alloc_and_read' mangled-name='efi_alloc_and_read' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='439' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_alloc_and_read'>
+      <parameter type-id='type-id-4' name='fd' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='439' column='1'/>
+      <parameter type-id='type-id-24' name='vtoc' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='439' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='efi_rescan' mangled-name='efi_rescan' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='607' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_rescan'>
-      <parameter type-id='type-id-4' name='fd' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='607' column='1'/>
+    <function-decl name='efi_rescan' mangled-name='efi_rescan' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='601' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_rescan'>
+      <parameter type-id='type-id-4' name='fd' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='601' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='efi_use_whole_disk' mangled-name='efi_use_whole_disk' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='1160' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_use_whole_disk'>
-      <parameter type-id='type-id-4' name='fd' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='1160' column='1'/>
+    <function-decl name='efi_use_whole_disk' mangled-name='efi_use_whole_disk' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='1154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_use_whole_disk'>
+      <parameter type-id='type-id-4' name='fd' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='1154' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='efi_write' mangled-name='efi_write' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='1376' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_write'>
-      <parameter type-id='type-id-4' name='fd' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='1376' column='1'/>
-      <parameter type-id='type-id-25' name='vtoc' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='1376' column='1'/>
+    <function-decl name='efi_write' mangled-name='efi_write' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='1370' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_write'>
+      <parameter type-id='type-id-4' name='fd' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='1370' column='1'/>
+      <parameter type-id='type-id-25' name='vtoc' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='1370' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='efi_type' mangled-name='efi_type' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='1590' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_type'>
-      <parameter type-id='type-id-4' name='fd' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='1590' column='1'/>
+    <function-decl name='efi_type' mangled-name='efi_type' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='1584' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_type'>
+      <parameter type-id='type-id-4' name='fd' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='1584' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-decl name='efi_err_check' mangled-name='efi_err_check' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='1612' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_err_check'>
-      <parameter type-id='type-id-25' name='vtoc' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='1612' column='1'/>
+    <function-decl name='efi_err_check' mangled-name='efi_err_check' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='1606' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_err_check'>
+      <parameter type-id='type-id-25' name='vtoc' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='1606' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='efi_auto_sense' mangled-name='efi_auto_sense' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='1707' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_auto_sense'>
-      <parameter type-id='type-id-4' name='fd' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='1707' column='1'/>
-      <parameter type-id='type-id-24' name='vtoc' filepath='/home/hutter/release20/zfs/lib/libefi/rdwr_efi.c' line='1707' column='1'/>
-      <return type-id='type-id-4'/>
-    </function-decl>
-    <function-decl name='sprintf' filepath='/usr/include/stdio.h' line='352' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-26'/>
-      <parameter type-id='type-id-27'/>
-      <parameter is-variadic='yes'/>
-      <return type-id='type-id-4'/>
-    </function-decl>
     <function-decl name='write' filepath='/usr/include/unistd.h' line='378' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-2'/>
-      <parameter type-id='type-id-28'/>
-      <return type-id='type-id-29'/>
+      <parameter type-id='type-id-26'/>
+      <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='fsync' filepath='/usr/include/unistd.h' line='985' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
@@ -440,9 +428,9 @@
   <abi-instr address-size='64' path='assert.c' comp-dir-path='/home/hutter/release20/zfs/lib/libspl' language='LANG_C99'>
     <var-decl name='aok' type-id='type-id-4' mangled-name='aok' visibility='default' filepath='../../lib/libspl/include/assert.h' line='37' column='1' elf-symbol-id='aok'/>
     <function-decl name='vfprintf' filepath='/usr/include/stdio.h' line='359' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-28'/>
+      <parameter type-id='type-id-29'/>
       <parameter type-id='type-id-30'/>
-      <parameter type-id='type-id-31'/>
-      <parameter type-id='type-id-32'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='abort' filepath='/usr/include/stdlib.h' line='596' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -450,211 +438,207 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='list.c' comp-dir-path='/home/hutter/release20/zfs/lib/libspl' language='LANG_C99'>
-    <typedef-decl name='list_node_t' type-id='type-id-33' filepath='../../lib/libspl/include/sys/list.h' line='35' column='1' id='type-id-34'/>
-    <typedef-decl name='list_t' type-id='type-id-35' filepath='../../lib/libspl/include/sys/list.h' line='36' column='1' id='type-id-36'/>
-    <class-decl name='list_node' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../lib/libspl/include/sys/list_impl.h' line='36' column='1' id='type-id-33'>
+    <typedef-decl name='list_node_t' type-id='type-id-31' filepath='../../lib/libspl/include/sys/list.h' line='35' column='1' id='type-id-32'/>
+    <typedef-decl name='list_t' type-id='type-id-33' filepath='../../lib/libspl/include/sys/list.h' line='36' column='1' id='type-id-34'/>
+    <class-decl name='list_node' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../lib/libspl/include/sys/list_impl.h' line='36' column='1' id='type-id-31'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-37' visibility='default' filepath='../../lib/libspl/include/sys/list_impl.h' line='37' column='1'/>
+        <var-decl name='next' type-id='type-id-35' visibility='default' filepath='../../lib/libspl/include/sys/list_impl.h' line='37' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='prev' type-id='type-id-37' visibility='default' filepath='../../lib/libspl/include/sys/list_impl.h' line='38' column='1'/>
+        <var-decl name='prev' type-id='type-id-35' visibility='default' filepath='../../lib/libspl/include/sys/list_impl.h' line='38' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='list' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../lib/libspl/include/sys/list_impl.h' line='41' column='1' id='type-id-35'>
+    <class-decl name='list' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../lib/libspl/include/sys/list_impl.h' line='41' column='1' id='type-id-33'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='list_size' type-id='type-id-28' visibility='default' filepath='../../lib/libspl/include/sys/list_impl.h' line='42' column='1'/>
+        <var-decl name='list_size' type-id='type-id-26' visibility='default' filepath='../../lib/libspl/include/sys/list_impl.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='list_offset' type-id='type-id-28' visibility='default' filepath='../../lib/libspl/include/sys/list_impl.h' line='43' column='1'/>
+        <var-decl name='list_offset' type-id='type-id-26' visibility='default' filepath='../../lib/libspl/include/sys/list_impl.h' line='43' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='list_head' type-id='type-id-33' visibility='default' filepath='../../lib/libspl/include/sys/list_impl.h' line='44' column='1'/>
+        <var-decl name='list_head' type-id='type-id-31' visibility='default' filepath='../../lib/libspl/include/sys/list_impl.h' line='44' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-37'/>
-    <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-38'/>
-    <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-39'/>
+    <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-35'/>
+    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-36'/>
+    <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-37'/>
     <function-decl name='list_create' mangled-name='list_create' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_create'>
-      <parameter type-id='type-id-39' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='62' column='1'/>
-      <parameter type-id='type-id-28' name='size' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='62' column='1'/>
-      <parameter type-id='type-id-28' name='offset' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='62' column='1'/>
+      <parameter type-id='type-id-37' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='62' column='1'/>
+      <parameter type-id='type-id-26' name='size' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='62' column='1'/>
+      <parameter type-id='type-id-26' name='offset' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='62' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='list_destroy' mangled-name='list_destroy' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='74' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_destroy'>
-      <parameter type-id='type-id-39' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='74' column='1'/>
+      <parameter type-id='type-id-37' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='74' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='list_insert_after' mangled-name='list_insert_after' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_insert_after'>
-      <parameter type-id='type-id-39' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='86' column='1'/>
+      <parameter type-id='type-id-37' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='86' column='1'/>
       <parameter type-id='type-id-2' name='object' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='86' column='1'/>
       <parameter type-id='type-id-2' name='nobject' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='86' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='list_insert_before' mangled-name='list_insert_before' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='97' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_insert_before'>
-      <parameter type-id='type-id-39' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='97' column='1'/>
+      <parameter type-id='type-id-37' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='97' column='1'/>
       <parameter type-id='type-id-2' name='object' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='97' column='1'/>
       <parameter type-id='type-id-2' name='nobject' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='97' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='list_insert_head' mangled-name='list_insert_head' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_insert_head'>
-      <parameter type-id='type-id-39' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='108' column='1'/>
+      <parameter type-id='type-id-37' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='108' column='1'/>
       <parameter type-id='type-id-2' name='object' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='108' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='list_insert_tail' mangled-name='list_insert_tail' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_insert_tail'>
-      <parameter type-id='type-id-39' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='115' column='1'/>
+      <parameter type-id='type-id-37' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='115' column='1'/>
       <parameter type-id='type-id-2' name='object' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='115' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='list_remove' mangled-name='list_remove' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_remove'>
-      <parameter type-id='type-id-39' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='122' column='1'/>
+      <parameter type-id='type-id-37' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='122' column='1'/>
       <parameter type-id='type-id-2' name='object' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='122' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='list_remove_head' mangled-name='list_remove_head' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='131' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_remove_head'>
-      <parameter type-id='type-id-39' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='131' column='1'/>
+      <parameter type-id='type-id-37' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='131' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='list_remove_tail' mangled-name='list_remove_tail' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_remove_tail'>
-      <parameter type-id='type-id-39' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='141' column='1'/>
+      <parameter type-id='type-id-37' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='141' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='list_head' mangled-name='list_head' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='151' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_head'>
-      <parameter type-id='type-id-39' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='151' column='1'/>
+      <parameter type-id='type-id-37' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='151' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='list_tail' mangled-name='list_tail' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='159' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_tail'>
-      <parameter type-id='type-id-39' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='159' column='1'/>
+      <parameter type-id='type-id-37' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='159' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='list_next' mangled-name='list_next' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_next'>
-      <parameter type-id='type-id-39' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='167' column='1'/>
+      <parameter type-id='type-id-37' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='167' column='1'/>
       <parameter type-id='type-id-2' name='object' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='167' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='list_prev' mangled-name='list_prev' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_prev'>
-      <parameter type-id='type-id-39' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='178' column='1'/>
+      <parameter type-id='type-id-37' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='178' column='1'/>
       <parameter type-id='type-id-2' name='object' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='178' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='list_move_tail' mangled-name='list_move_tail' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_move_tail'>
-      <parameter type-id='type-id-39' name='dst' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='192' column='1'/>
-      <parameter type-id='type-id-39' name='src' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='192' column='1'/>
+      <parameter type-id='type-id-37' name='dst' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='192' column='1'/>
+      <parameter type-id='type-id-37' name='src' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='192' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='list_link_replace' mangled-name='list_link_replace' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='213' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_link_replace'>
-      <parameter type-id='type-id-38' name='lold' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='213' column='1'/>
-      <parameter type-id='type-id-38' name='lnew' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='213' column='1'/>
+      <parameter type-id='type-id-36' name='lold' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='213' column='1'/>
+      <parameter type-id='type-id-36' name='lnew' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='213' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='list_link_init' mangled-name='list_link_init' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_link_init'>
-      <parameter type-id='type-id-38' name='ln' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='226' column='1'/>
+      <parameter type-id='type-id-36' name='ln' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='226' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='list_link_active' mangled-name='list_link_active' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='233' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_link_active'>
-      <parameter type-id='type-id-38' name='ln' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='233' column='1'/>
+      <parameter type-id='type-id-36' name='ln' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='233' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='list_is_empty' mangled-name='list_is_empty' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_is_empty'>
-      <parameter type-id='type-id-39' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='240' column='1'/>
+      <parameter type-id='type-id-37' name='list' filepath='/home/hutter/release20/zfs/lib/libspl/list.c' line='240' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='mkdirp.c' comp-dir-path='/home/hutter/release20/zfs/lib/libspl' language='LANG_C99'>
-    <typedef-decl name='mode_t' type-id='type-id-40' filepath='/usr/include/sys/types.h' line='69' column='1' id='type-id-41'/>
-    <typedef-decl name='wchar_t' type-id='type-id-4' filepath='/usr/lib/gcc/x86_64-redhat-linux/11/include/stddef.h' line='321' column='1' id='type-id-42'/>
-    <qualified-type-def type-id='type-id-42' const='yes' id='type-id-43'/>
-    <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-44'/>
+    <typedef-decl name='mode_t' type-id='type-id-38' filepath='/usr/include/sys/types.h' line='69' column='1' id='type-id-39'/>
+    <typedef-decl name='wchar_t' type-id='type-id-4' filepath='/usr/lib/gcc/x86_64-redhat-linux/11/include/stddef.h' line='321' column='1' id='type-id-40'/>
+    <qualified-type-def type-id='type-id-40' const='yes' id='type-id-41'/>
+    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-42'/>
+    <qualified-type-def type-id='type-id-42' restrict='yes' id='type-id-43'/>
+    <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-44'/>
     <qualified-type-def type-id='type-id-44' restrict='yes' id='type-id-45'/>
-    <pointer-type-def type-id='type-id-42' size-in-bits='64' id='type-id-46'/>
-    <qualified-type-def type-id='type-id-46' restrict='yes' id='type-id-47'/>
     <function-decl name='mkdirp' mangled-name='mkdirp' filepath='/home/hutter/release20/zfs/lib/libspl/mkdirp.c' line='50' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mkdirp'>
-      <parameter type-id='type-id-27' name='d' filepath='/home/hutter/release20/zfs/lib/libspl/mkdirp.c' line='50' column='1'/>
-      <parameter type-id='type-id-41' name='mode' filepath='/home/hutter/release20/zfs/lib/libspl/mkdirp.c' line='50' column='1'/>
+      <parameter type-id='type-id-46' name='d' filepath='/home/hutter/release20/zfs/lib/libspl/mkdirp.c' line='50' column='1'/>
+      <parameter type-id='type-id-39' name='mode' filepath='/home/hutter/release20/zfs/lib/libspl/mkdirp.c' line='50' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='mbstowcs' filepath='/usr/include/stdlib.h' line='939' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-47'/>
-      <parameter type-id='type-id-31'/>
-      <parameter type-id='type-id-28'/>
-      <return type-id='type-id-28'/>
+      <parameter type-id='type-id-45'/>
+      <parameter type-id='type-id-29'/>
+      <parameter type-id='type-id-26'/>
+      <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='wcstombs' filepath='/usr/include/stdlib.h' line='943' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-48'/>
-      <parameter type-id='type-id-45'/>
-      <parameter type-id='type-id-28'/>
-      <return type-id='type-id-28'/>
+      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-26'/>
+      <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='mkdir' filepath='/usr/include/sys/stat.h' line='389' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-40'/>
+      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-38'/>
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='os/linux/getexecname.c' comp-dir-path='/home/hutter/release20/zfs/lib/libspl' language='LANG_C99'>
     <function-decl name='getexecname' mangled-name='getexecname' filepath='os/linux/getexecname.c' line='35' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getexecname'>
-      <return type-id='type-id-27'/>
+      <return type-id='type-id-46'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='os/linux/gethostid.c' comp-dir-path='/home/hutter/release20/zfs/lib/libspl' language='LANG_C99'>
-    <function-decl name='fclose' filepath='/usr/include/stdio.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-49'/>
-      <return type-id='type-id-4'/>
-    </function-decl>
     <function-decl name='get_system_hostid' mangled-name='get_system_hostid' filepath='os/linux/gethostid.c' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_system_hostid'>
       <return type-id='type-id-10'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='os/linux/getmntany.c' comp-dir-path='/home/hutter/release20/zfs/lib/libspl' language='LANG_C99'>
-    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='32880' id='type-id-51'>
-      <subrange length='4110' type-id='type-id-10' id='type-id-52'/>
+    <array-type-def dimensions='1' type-id='type-id-48' size-in-bits='32880' id='type-id-49'>
+      <subrange length='4110' type-id='type-id-10' id='type-id-50'/>
     </array-type-def>
-    <class-decl name='mnttab' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='49' column='1' id='type-id-53'>
+    <class-decl name='mnttab' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='49' column='1' id='type-id-51'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='mnt_special' type-id='type-id-26' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='50' column='1'/>
+        <var-decl name='mnt_special' type-id='type-id-52' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='mnt_mountp' type-id='type-id-26' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='51' column='1'/>
+        <var-decl name='mnt_mountp' type-id='type-id-52' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='mnt_fstype' type-id='type-id-26' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='52' column='1'/>
+        <var-decl name='mnt_fstype' type-id='type-id-52' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='mnt_mntopts' type-id='type-id-26' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='53' column='1'/>
+        <var-decl name='mnt_mntopts' type-id='type-id-52' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='53' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='extmnttab' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='62' column='1' id='type-id-54'>
+    <class-decl name='extmnttab' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='62' column='1' id='type-id-53'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='mnt_special' type-id='type-id-26' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='63' column='1'/>
+        <var-decl name='mnt_special' type-id='type-id-52' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='mnt_mountp' type-id='type-id-26' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='64' column='1'/>
+        <var-decl name='mnt_mountp' type-id='type-id-52' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='64' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='mnt_fstype' type-id='type-id-26' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='65' column='1'/>
+        <var-decl name='mnt_fstype' type-id='type-id-52' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='65' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='mnt_mntopts' type-id='type-id-26' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='66' column='1'/>
+        <var-decl name='mnt_mntopts' type-id='type-id-52' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='mnt_major' type-id='type-id-55' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='67' column='1'/>
+        <var-decl name='mnt_major' type-id='type-id-54' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='67' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='mnt_minor' type-id='type-id-55' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='68' column='1'/>
+        <var-decl name='mnt_minor' type-id='type-id-54' visibility='default' filepath='../../lib/libspl/include/os/linux/sys/mnttab.h' line='68' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='mntent' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/mntent.h' line='51' column='1' id='type-id-56'>
+    <class-decl name='mntent' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/mntent.h' line='51' column='1' id='type-id-55'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='mnt_fsname' type-id='type-id-26' visibility='default' filepath='/usr/include/mntent.h' line='53' column='1'/>
+        <var-decl name='mnt_fsname' type-id='type-id-52' visibility='default' filepath='/usr/include/mntent.h' line='53' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='mnt_dir' type-id='type-id-26' visibility='default' filepath='/usr/include/mntent.h' line='54' column='1'/>
+        <var-decl name='mnt_dir' type-id='type-id-52' visibility='default' filepath='/usr/include/mntent.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='mnt_type' type-id='type-id-26' visibility='default' filepath='/usr/include/mntent.h' line='55' column='1'/>
+        <var-decl name='mnt_type' type-id='type-id-52' visibility='default' filepath='/usr/include/mntent.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='mnt_opts' type-id='type-id-26' visibility='default' filepath='/usr/include/mntent.h' line='56' column='1'/>
+        <var-decl name='mnt_opts' type-id='type-id-52' visibility='default' filepath='/usr/include/mntent.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='mnt_freq' type-id='type-id-4' visibility='default' filepath='/usr/include/mntent.h' line='57' column='1'/>
@@ -663,19 +647,19 @@
         <var-decl name='mnt_passno' type-id='type-id-4' visibility='default' filepath='/usr/include/mntent.h' line='58' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-54' size-in-bits='64' id='type-id-57'/>
-    <pointer-type-def type-id='type-id-56' size-in-bits='64' id='type-id-58'/>
-    <qualified-type-def type-id='type-id-58' restrict='yes' id='type-id-59'/>
-    <pointer-type-def type-id='type-id-53' size-in-bits='64' id='type-id-60'/>
+    <pointer-type-def type-id='type-id-53' size-in-bits='64' id='type-id-56'/>
+    <pointer-type-def type-id='type-id-55' size-in-bits='64' id='type-id-57'/>
+    <qualified-type-def type-id='type-id-57' restrict='yes' id='type-id-58'/>
+    <pointer-type-def type-id='type-id-51' size-in-bits='64' id='type-id-59'/>
     <function-decl name='getmntent_r' filepath='/usr/include/mntent.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-30'/>
-      <parameter type-id='type-id-59'/>
-      <parameter type-id='type-id-48'/>
+      <parameter type-id='type-id-28'/>
+      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-47'/>
       <parameter type-id='type-id-4'/>
-      <return type-id='type-id-58'/>
+      <return type-id='type-id-57'/>
     </function-decl>
     <function-decl name='feof' filepath='/usr/include/stdio.h' line='782' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-49'/>
+      <parameter type-id='type-id-60'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='gnu_dev_major' filepath='/usr/include/sys/sysmacros.h' line='35' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -691,21 +675,21 @@
       <parameter type-id='type-id-15'/>
       <return type-id='type-id-61'/>
     </function-decl>
-    <var-decl name='buf' type-id='type-id-51' mangled-name='buf' visibility='default' filepath='os/linux/getmntany.c' line='44' column='1' elf-symbol-id='buf'/>
+    <var-decl name='buf' type-id='type-id-49' mangled-name='buf' visibility='default' filepath='os/linux/getmntany.c' line='44' column='1' elf-symbol-id='buf'/>
     <function-decl name='getmntany' mangled-name='getmntany' filepath='os/linux/getmntany.c' line='51' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getmntany'>
-      <parameter type-id='type-id-49' name='fp' filepath='os/linux/getmntany.c' line='51' column='1'/>
-      <parameter type-id='type-id-60' name='mgetp' filepath='os/linux/getmntany.c' line='51' column='1'/>
-      <parameter type-id='type-id-60' name='mrefp' filepath='os/linux/getmntany.c' line='51' column='1'/>
+      <parameter type-id='type-id-60' name='fp' filepath='os/linux/getmntany.c' line='51' column='1'/>
+      <parameter type-id='type-id-59' name='mgetp' filepath='os/linux/getmntany.c' line='51' column='1'/>
+      <parameter type-id='type-id-59' name='mrefp' filepath='os/linux/getmntany.c' line='51' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='_sol_getmntent' mangled-name='_sol_getmntent' filepath='os/linux/getmntany.c' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_sol_getmntent'>
-      <parameter type-id='type-id-49' name='fp' filepath='os/linux/getmntany.c' line='64' column='1'/>
-      <parameter type-id='type-id-60' name='mgetp' filepath='os/linux/getmntany.c' line='64' column='1'/>
+      <parameter type-id='type-id-60' name='fp' filepath='os/linux/getmntany.c' line='64' column='1'/>
+      <parameter type-id='type-id-59' name='mgetp' filepath='os/linux/getmntany.c' line='64' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='getextmntent' mangled-name='getextmntent' filepath='os/linux/getmntany.c' line='106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getextmntent'>
-      <parameter type-id='type-id-27' name='path' filepath='os/linux/getmntany.c' line='106' column='1'/>
-      <parameter type-id='type-id-57' name='entry' filepath='os/linux/getmntany.c' line='106' column='1'/>
+      <parameter type-id='type-id-46' name='path' filepath='os/linux/getmntany.c' line='106' column='1'/>
+      <parameter type-id='type-id-56' name='entry' filepath='os/linux/getmntany.c' line='106' column='1'/>
       <parameter type-id='type-id-62' name='statbuf' filepath='os/linux/getmntany.c' line='106' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
@@ -717,13 +701,13 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='page.c' comp-dir-path='/home/hutter/release20/zfs/lib/libspl' language='LANG_C99'>
-    <var-decl name='pagesize' type-id='type-id-28' mangled-name='pagesize' visibility='default' filepath='/home/hutter/release20/zfs/lib/libspl/page.c' line='25' column='1' elf-symbol-id='pagesize'/>
+    <var-decl name='pagesize' type-id='type-id-26' mangled-name='pagesize' visibility='default' filepath='/home/hutter/release20/zfs/lib/libspl/page.c' line='25' column='1' elf-symbol-id='pagesize'/>
   </abi-instr>
   <abi-instr address-size='64' path='strlcat.c' comp-dir-path='/home/hutter/release20/zfs/lib/libspl' language='LANG_C99'>
     <function-decl name='memcpy' filepath='/usr/include/string.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-2'/>
-      <parameter type-id='type-id-28'/>
+      <parameter type-id='type-id-26'/>
       <return type-id='type-id-2'/>
     </function-decl>
   </abi-instr>
@@ -760,7 +744,7 @@
         <var-decl name='tm_gmtoff' type-id='type-id-65' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='20' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='tm_zone' type-id='type-id-27' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='21' column='1'/>
+        <var-decl name='tm_zone' type-id='type-id-46' visibility='default' filepath='/usr/include/bits/types/struct_tm.h' line='21' column='1'/>
       </data-member>
     </class-decl>
     <typedef-decl name='time_t' type-id='type-id-66' filepath='/usr/include/bits/types/time_t.h' line='10' column='1' id='type-id-67'/>
@@ -773,23 +757,23 @@
     <pointer-type-def type-id='type-id-67' size-in-bits='64' id='type-id-74'/>
     <pointer-type-def type-id='type-id-64' size-in-bits='64' id='type-id-75'/>
     <function-decl name='print_timestamp' mangled-name='print_timestamp' filepath='/home/hutter/release20/zfs/lib/libspl/timestamp.c' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='print_timestamp'>
-      <parameter type-id='type-id-55' name='timestamp_fmt' filepath='/home/hutter/release20/zfs/lib/libspl/timestamp.c' line='44' column='1'/>
+      <parameter type-id='type-id-54' name='timestamp_fmt' filepath='/home/hutter/release20/zfs/lib/libspl/timestamp.c' line='44' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='nl_langinfo' filepath='/usr/include/langinfo.h' line='661' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-68'/>
-      <return type-id='type-id-26'/>
+      <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='time' filepath='/usr/include/time.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-74'/>
       <return type-id='type-id-67'/>
     </function-decl>
     <function-decl name='strftime' filepath='/usr/include/time.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-48'/>
-      <parameter type-id='type-id-28'/>
-      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-26'/>
+      <parameter type-id='type-id-29'/>
       <parameter type-id='type-id-73'/>
-      <return type-id='type-id-28'/>
+      <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='localtime' filepath='/usr/include/time.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-70'/>
@@ -803,7 +787,7 @@
     <array-type-def dimensions='1' type-id='type-id-79' size-in-bits='1024' id='type-id-80'>
       <subrange length='16' type-id='type-id-10' id='type-id-11'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='384' id='type-id-81'>
+    <array-type-def dimensions='1' type-id='type-id-48' size-in-bits='384' id='type-id-81'>
       <subrange length='48' type-id='type-id-10' id='type-id-82'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-65' size-in-bits='512' id='type-id-83'>
@@ -1046,7 +1030,7 @@
     </function-decl>
     <function-decl name='pthread_attr_setguardsize' filepath='/usr/include/pthread.h' line='308' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-143'/>
-      <parameter type-id='type-id-28'/>
+      <parameter type-id='type-id-26'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='pthread_attr_getschedparam' filepath='/usr/include/pthread.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1098,18 +1082,18 @@
     <function-decl name='pthread_attr_setstack' filepath='/usr/include/pthread.h' line='387' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-143'/>
       <parameter type-id='type-id-2'/>
-      <parameter type-id='type-id-28'/>
+      <parameter type-id='type-id-26'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='pthread_attr_setaffinity_np' filepath='/usr/include/pthread.h' line='394' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-143'/>
-      <parameter type-id='type-id-28'/>
+      <parameter type-id='type-id-26'/>
       <parameter type-id='type-id-125'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='pthread_attr_getaffinity_np' filepath='/usr/include/pthread.h' line='401' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-128'/>
-      <parameter type-id='type-id-28'/>
+      <parameter type-id='type-id-26'/>
       <parameter type-id='type-id-140'/>
       <return type-id='type-id-4'/>
     </function-decl>
@@ -1204,7 +1188,7 @@
         <var-decl name='tp_flags' type-id='type-id-4' visibility='default' filepath='/home/hutter/release20/zfs/lib/libtpool/thread_pool_impl.h' line='74' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2272'>
-        <var-decl name='tp_linger' type-id='type-id-55' visibility='default' filepath='/home/hutter/release20/zfs/lib/libtpool/thread_pool_impl.h' line='75' column='1'/>
+        <var-decl name='tp_linger' type-id='type-id-54' visibility='default' filepath='/home/hutter/release20/zfs/lib/libtpool/thread_pool_impl.h' line='75' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
         <var-decl name='tp_njobs' type-id='type-id-4' visibility='default' filepath='/home/hutter/release20/zfs/lib/libtpool/thread_pool_impl.h' line='76' column='1'/>
@@ -1228,17 +1212,17 @@
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='libzfs_core.c' comp-dir-path='/home/hutter/release20/zfs/lib/libzfs_core' language='LANG_C99'>
-    <type-decl name='char' size-in-bits='8' id='type-id-50'/>
-    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='2048' id='type-id-165'>
+    <type-decl name='char' size-in-bits='8' id='type-id-48'/>
+    <array-type-def dimensions='1' type-id='type-id-48' size-in-bits='2048' id='type-id-165'>
       <subrange length='256' type-id='type-id-10' id='type-id-166'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='32768' id='type-id-167'>
+    <array-type-def dimensions='1' type-id='type-id-48' size-in-bits='32768' id='type-id-167'>
       <subrange length='4096' type-id='type-id-10' id='type-id-168'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='320' id='type-id-169'>
+    <array-type-def dimensions='1' type-id='type-id-48' size-in-bits='320' id='type-id-169'>
       <subrange length='40' type-id='type-id-10' id='type-id-170'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='65536' id='type-id-171'>
+    <array-type-def dimensions='1' type-id='type-id-48' size-in-bits='65536' id='type-id-171'>
       <subrange length='8192' type-id='type-id-10' id='type-id-172'/>
     </array-type-def>
     <type-decl name='int' size-in-bits='32' id='type-id-4'/>
@@ -2092,7 +2076,7 @@
     </enum-decl>
     <typedef-decl name='boolean_t' type-id='type-id-244' filepath='../../lib/libspl/include/sys/stdtypes.h' line='29' column='1' id='type-id-6'/>
     <typedef-decl name='uchar_t' type-id='type-id-13' filepath='../../lib/libspl/include/sys/stdtypes.h' line='31' column='1' id='type-id-245'/>
-    <typedef-decl name='uint_t' type-id='type-id-15' filepath='../../lib/libspl/include/sys/stdtypes.h' line='33' column='1' id='type-id-55'/>
+    <typedef-decl name='uint_t' type-id='type-id-15' filepath='../../lib/libspl/include/sys/stdtypes.h' line='33' column='1' id='type-id-54'/>
     <union-decl name='pthread_mutex_t' size-in-bits='320' naming-typedef-id='type-id-163' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='67' column='1' id='type-id-246'>
       <data-member access='public'>
         <var-decl name='__data' type-id='type-id-247' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='69' column='1'/>
@@ -2151,13 +2135,13 @@
     <typedef-decl name='__uint32_t' type-id='type-id-15' filepath='/usr/include/bits/types.h' line='42' column='1' id='type-id-251'/>
     <typedef-decl name='__uint64_t' type-id='type-id-10' filepath='/usr/include/bits/types.h' line='45' column='1' id='type-id-252'/>
     <typedef-decl name='__ssize_t' type-id='type-id-65' filepath='/usr/include/bits/types.h' line='194' column='1' id='type-id-256'/>
-    <typedef-decl name='ssize_t' type-id='type-id-256' filepath='/usr/include/sys/types.h' line='108' column='1' id='type-id-29'/>
-    <typedef-decl name='size_t' type-id='type-id-10' filepath='/usr/lib/gcc/x86_64-redhat-linux/11/include/stddef.h' line='209' column='1' id='type-id-28'/>
+    <typedef-decl name='ssize_t' type-id='type-id-256' filepath='/usr/include/sys/types.h' line='108' column='1' id='type-id-27'/>
+    <typedef-decl name='size_t' type-id='type-id-10' filepath='/usr/lib/gcc/x86_64-redhat-linux/11/include/stddef.h' line='209' column='1' id='type-id-26'/>
     <pointer-type-def type-id='type-id-254' size-in-bits='64' id='type-id-255'/>
     <pointer-type-def type-id='type-id-6' size-in-bits='64' id='type-id-257'/>
-    <pointer-type-def type-id='type-id-50' size-in-bits='64' id='type-id-26'/>
-    <qualified-type-def type-id='type-id-50' const='yes' id='type-id-258'/>
-    <pointer-type-def type-id='type-id-258' size-in-bits='64' id='type-id-27'/>
+    <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-52'/>
+    <qualified-type-def type-id='type-id-48' const='yes' id='type-id-258'/>
+    <pointer-type-def type-id='type-id-258' size-in-bits='64' id='type-id-46'/>
     <qualified-type-def type-id='type-id-236' const='yes' id='type-id-259'/>
     <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-260'/>
     <qualified-type-def type-id='type-id-219' const='yes' id='type-id-261'/>
@@ -2167,7 +2151,7 @@
     <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-264'/>
     <pointer-type-def type-id='type-id-216' size-in-bits='64' id='type-id-265'/>
     <pointer-type-def type-id='type-id-163' size-in-bits='64' id='type-id-147'/>
-    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-153'/>
+    <pointer-type-def type-id='type-id-26' size-in-bits='64' id='type-id-153'/>
     <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-266'/>
     <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-267'/>
     <pointer-type-def type-id='type-id-179' size-in-bits='64' id='type-id-268'/>
@@ -2184,21 +2168,21 @@
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='nvlist_unpack' filepath='../../include/sys/nvpair.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-52'/>
       <parameter type-id='type-id-26'/>
-      <parameter type-id='type-id-28'/>
       <parameter type-id='type-id-264'/>
       <parameter type-id='type-id-4'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='nvlist_lookup_uint64' filepath='../../include/sys/nvpair.h' line='212' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-267'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='nvlist_lookup_nvlist' filepath='../../include/sys/nvpair.h' line='214' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-264'/>
       <return type-id='type-id-4'/>
     </function-decl>
@@ -2209,7 +2193,7 @@
     </function-decl>
     <function-decl name='nvpair_name' filepath='../../include/sys/nvpair.h' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-265'/>
-      <return type-id='type-id-26'/>
+      <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='fnvlist_alloc' filepath='../../include/sys/nvpair.h' line='276' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-263'/>
@@ -2221,16 +2205,16 @@
     <function-decl name='fnvlist_pack' filepath='../../include/sys/nvpair.h' line='279' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
       <parameter type-id='type-id-153'/>
-      <return type-id='type-id-26'/>
+      <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='fnvlist_pack_free' filepath='../../include/sys/nvpair.h' line='280' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-52'/>
       <parameter type-id='type-id-26'/>
-      <parameter type-id='type-id-28'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='fnvlist_unpack' filepath='../../include/sys/nvpair.h' line='281' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-52'/>
       <parameter type-id='type-id-26'/>
-      <parameter type-id='type-id-28'/>
       <return type-id='type-id-263'/>
     </function-decl>
     <function-decl name='fnvlist_dup' filepath='../../include/sys/nvpair.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2239,81 +2223,81 @@
     </function-decl>
     <function-decl name='fnvlist_add_boolean' filepath='../../include/sys/nvpair.h' line='286' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='fnvlist_add_boolean_value' filepath='../../include/sys/nvpair.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='fnvlist_add_int32' filepath='../../include/sys/nvpair.h' line='293' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-214'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='fnvlist_add_uint64' filepath='../../include/sys/nvpair.h' line='296' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-174'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='fnvlist_add_string' filepath='../../include/sys/nvpair.h' line='297' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-46'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='fnvlist_add_nvlist' filepath='../../include/sys/nvpair.h' line='298' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-263'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='fnvlist_add_byte_array' filepath='../../include/sys/nvpair.h' line='301' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-266'/>
-      <parameter type-id='type-id-55'/>
+      <parameter type-id='type-id-54'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='fnvlist_add_uint8_array' filepath='../../include/sys/nvpair.h' line='303' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-268'/>
-      <parameter type-id='type-id-55'/>
+      <parameter type-id='type-id-54'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='fnvlist_lookup_boolean_value' filepath='../../include/sys/nvpair.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='fnvlist_lookup_uint64' filepath='../../include/sys/nvpair.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <return type-id='type-id-174'/>
     </function-decl>
     <function-decl name='fnvlist_lookup_string' filepath='../../include/sys/nvpair.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
-      <return type-id='type-id-26'/>
+      <parameter type-id='type-id-46'/>
+      <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='libspl_assertf' mangled-name='libspl_assertf' filepath='../../lib/libspl/include/assert.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='libspl_assertf'>
-      <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-4'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='strlcpy' mangled-name='strlcpy' filepath='../../lib/libspl/include/string.h' line='37' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strlcpy'>
+      <parameter type-id='type-id-52'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-26'/>
-      <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-28'/>
-      <return type-id='type-id-28'/>
+      <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='libzfs_core_init' mangled-name='libzfs_core_init' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='136' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='libzfs_core_init'>
       <return type-id='type-id-4'/>
@@ -2322,32 +2306,32 @@
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='lzc_create' mangled-name='lzc_create' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='249' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_create'>
-      <parameter type-id='type-id-27' name='fsname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='249' column='1'/>
+      <parameter type-id='type-id-46' name='fsname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='249' column='1'/>
       <parameter type-id='type-id-192' name='type' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='249' column='1'/>
       <parameter type-id='type-id-263' name='props' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='249' column='1'/>
       <parameter type-id='type-id-268' name='wkeydata' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='250' column='1'/>
-      <parameter type-id='type-id-55' name='wkeylen' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='250' column='1'/>
+      <parameter type-id='type-id-54' name='wkeylen' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='250' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_clone' mangled-name='lzc_clone' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='274' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_clone'>
-      <parameter type-id='type-id-27' name='fsname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='274' column='1'/>
-      <parameter type-id='type-id-27' name='origin' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='274' column='1'/>
+      <parameter type-id='type-id-46' name='fsname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='274' column='1'/>
+      <parameter type-id='type-id-46' name='origin' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='274' column='1'/>
       <parameter type-id='type-id-263' name='props' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='274' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_promote' mangled-name='lzc_promote' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='290' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_promote'>
-      <parameter type-id='type-id-27' name='fsname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='290' column='1'/>
-      <parameter type-id='type-id-26' name='snapnamebuf' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='290' column='1'/>
+      <parameter type-id='type-id-46' name='fsname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='290' column='1'/>
+      <parameter type-id='type-id-52' name='snapnamebuf' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='290' column='1'/>
       <parameter type-id='type-id-4' name='snapnamelen' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='290' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_rename' mangled-name='lzc_rename' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='312' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_rename'>
-      <parameter type-id='type-id-27' name='source' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='312' column='1'/>
-      <parameter type-id='type-id-27' name='target' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='312' column='1'/>
+      <parameter type-id='type-id-46' name='source' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='312' column='1'/>
+      <parameter type-id='type-id-46' name='target' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='312' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_destroy' mangled-name='lzc_destroy' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='327' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_destroy'>
-      <parameter type-id='type-id-27' name='fsname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='327' column='1'/>
+      <parameter type-id='type-id-46' name='fsname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='327' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_snapshot' mangled-name='lzc_snapshot' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='352' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_snapshot'>
@@ -2363,17 +2347,17 @@
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_snaprange_space' mangled-name='lzc_snaprange_space' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='430' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_snaprange_space'>
-      <parameter type-id='type-id-27' name='firstsnap' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='430' column='1'/>
-      <parameter type-id='type-id-27' name='lastsnap' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='430' column='1'/>
+      <parameter type-id='type-id-46' name='firstsnap' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='430' column='1'/>
+      <parameter type-id='type-id-46' name='lastsnap' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='430' column='1'/>
       <parameter type-id='type-id-267' name='usedp' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='431' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_exists' mangled-name='lzc_exists' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='459' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_exists'>
-      <parameter type-id='type-id-27' name='dataset' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='459' column='1'/>
+      <parameter type-id='type-id-46' name='dataset' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='459' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='lzc_sync' mangled-name='lzc_sync' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='481' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_sync'>
-      <parameter type-id='type-id-27' name='pool_name' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='481' column='1'/>
+      <parameter type-id='type-id-46' name='pool_name' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='481' column='1'/>
       <parameter type-id='type-id-263' name='innvl' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='481' column='1'/>
       <parameter type-id='type-id-264' name='outnvl' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='481' column='1'/>
       <return type-id='type-id-4'/>
@@ -2390,28 +2374,28 @@
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_get_holds' mangled-name='lzc_get_holds' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='584' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_get_holds'>
-      <parameter type-id='type-id-27' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='584' column='1'/>
+      <parameter type-id='type-id-46' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='584' column='1'/>
       <parameter type-id='type-id-264' name='holdsp' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='584' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_send' mangled-name='lzc_send' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='625' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_send'>
-      <parameter type-id='type-id-27' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='625' column='1'/>
-      <parameter type-id='type-id-27' name='from' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='625' column='1'/>
+      <parameter type-id='type-id-46' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='625' column='1'/>
+      <parameter type-id='type-id-46' name='from' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='625' column='1'/>
       <parameter type-id='type-id-4' name='fd' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='625' column='1'/>
       <parameter type-id='type-id-193' name='flags' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='626' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_send_redacted' mangled-name='lzc_send_redacted' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='633' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_send_redacted'>
-      <parameter type-id='type-id-27' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='633' column='1'/>
-      <parameter type-id='type-id-27' name='from' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='633' column='1'/>
+      <parameter type-id='type-id-46' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='633' column='1'/>
+      <parameter type-id='type-id-46' name='from' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='633' column='1'/>
       <parameter type-id='type-id-4' name='fd' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='633' column='1'/>
       <parameter type-id='type-id-193' name='flags' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='634' column='1'/>
-      <parameter type-id='type-id-27' name='redactbook' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='634' column='1'/>
+      <parameter type-id='type-id-46' name='redactbook' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='634' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_send_resume' mangled-name='lzc_send_resume' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='641' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_send_resume'>
-      <parameter type-id='type-id-27' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='641' column='1'/>
-      <parameter type-id='type-id-27' name='from' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='641' column='1'/>
+      <parameter type-id='type-id-46' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='641' column='1'/>
+      <parameter type-id='type-id-46' name='from' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='641' column='1'/>
       <parameter type-id='type-id-4' name='fd' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='641' column='1'/>
       <parameter type-id='type-id-193' name='flags' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='642' column='1'/>
       <parameter type-id='type-id-174' name='resumeobj' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='642' column='1'/>
@@ -2419,56 +2403,56 @@
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_send_resume_redacted' mangled-name='lzc_send_resume_redacted' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='661' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_send_resume_redacted'>
-      <parameter type-id='type-id-27' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='661' column='1'/>
-      <parameter type-id='type-id-27' name='from' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='661' column='1'/>
+      <parameter type-id='type-id-46' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='661' column='1'/>
+      <parameter type-id='type-id-46' name='from' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='661' column='1'/>
       <parameter type-id='type-id-4' name='fd' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='661' column='1'/>
       <parameter type-id='type-id-193' name='flags' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='662' column='1'/>
       <parameter type-id='type-id-174' name='resumeobj' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='662' column='1'/>
       <parameter type-id='type-id-174' name='resumeoff' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='662' column='1'/>
-      <parameter type-id='type-id-27' name='redactbook' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='663' column='1'/>
+      <parameter type-id='type-id-46' name='redactbook' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='663' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_send_space_resume_redacted' mangled-name='lzc_send_space_resume_redacted' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='711' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_send_space_resume_redacted'>
-      <parameter type-id='type-id-27' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='711' column='1'/>
-      <parameter type-id='type-id-27' name='from' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='711' column='1'/>
+      <parameter type-id='type-id-46' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='711' column='1'/>
+      <parameter type-id='type-id-46' name='from' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='711' column='1'/>
       <parameter type-id='type-id-193' name='flags' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='712' column='1'/>
       <parameter type-id='type-id-174' name='resumeobj' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='712' column='1'/>
       <parameter type-id='type-id-174' name='resumeoff' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='712' column='1'/>
       <parameter type-id='type-id-174' name='resume_bytes' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='713' column='1'/>
-      <parameter type-id='type-id-27' name='redactbook' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='713' column='1'/>
+      <parameter type-id='type-id-46' name='redactbook' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='713' column='1'/>
       <parameter type-id='type-id-4' name='fd' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='713' column='1'/>
       <parameter type-id='type-id-267' name='spacep' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='713' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_send_space' mangled-name='lzc_send_space' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='749' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_send_space'>
-      <parameter type-id='type-id-27' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='749' column='1'/>
-      <parameter type-id='type-id-27' name='from' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='749' column='1'/>
+      <parameter type-id='type-id-46' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='749' column='1'/>
+      <parameter type-id='type-id-46' name='from' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='749' column='1'/>
       <parameter type-id='type-id-193' name='flags' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='750' column='1'/>
       <parameter type-id='type-id-267' name='spacep' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='750' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_receive' mangled-name='lzc_receive' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='966' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_receive'>
-      <parameter type-id='type-id-27' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='966' column='1'/>
+      <parameter type-id='type-id-46' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='966' column='1'/>
       <parameter type-id='type-id-263' name='props' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='966' column='1'/>
-      <parameter type-id='type-id-27' name='origin' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='966' column='1'/>
+      <parameter type-id='type-id-46' name='origin' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='966' column='1'/>
       <parameter type-id='type-id-6' name='force' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='967' column='1'/>
       <parameter type-id='type-id-6' name='raw' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='967' column='1'/>
       <parameter type-id='type-id-4' name='fd' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='967' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_receive_resumable' mangled-name='lzc_receive_resumable' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='980' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_receive_resumable'>
-      <parameter type-id='type-id-27' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='980' column='1'/>
+      <parameter type-id='type-id-46' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='980' column='1'/>
       <parameter type-id='type-id-263' name='props' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='980' column='1'/>
-      <parameter type-id='type-id-27' name='origin' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='980' column='1'/>
+      <parameter type-id='type-id-46' name='origin' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='980' column='1'/>
       <parameter type-id='type-id-6' name='force' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='981' column='1'/>
       <parameter type-id='type-id-6' name='raw' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='981' column='1'/>
       <parameter type-id='type-id-4' name='fd' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='981' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_receive_with_header' mangled-name='lzc_receive_with_header' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='999' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_receive_with_header'>
-      <parameter type-id='type-id-27' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='999' column='1'/>
+      <parameter type-id='type-id-46' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='999' column='1'/>
       <parameter type-id='type-id-263' name='props' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='999' column='1'/>
-      <parameter type-id='type-id-27' name='origin' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1000' column='1'/>
+      <parameter type-id='type-id-46' name='origin' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1000' column='1'/>
       <parameter type-id='type-id-6' name='force' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1000' column='1'/>
       <parameter type-id='type-id-6' name='resumable' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1000' column='1'/>
       <parameter type-id='type-id-6' name='raw' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1000' column='1'/>
@@ -2477,9 +2461,9 @@
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_receive_one' mangled-name='lzc_receive_one' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1028' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_receive_one'>
-      <parameter type-id='type-id-27' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1028' column='1'/>
+      <parameter type-id='type-id-46' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1028' column='1'/>
       <parameter type-id='type-id-263' name='props' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1028' column='1'/>
-      <parameter type-id='type-id-27' name='origin' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1029' column='1'/>
+      <parameter type-id='type-id-46' name='origin' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1029' column='1'/>
       <parameter type-id='type-id-6' name='force' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1029' column='1'/>
       <parameter type-id='type-id-6' name='resumable' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1029' column='1'/>
       <parameter type-id='type-id-6' name='raw' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1029' column='1'/>
@@ -2493,12 +2477,12 @@
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_receive_with_cmdprops' mangled-name='lzc_receive_with_cmdprops' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1047' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_receive_with_cmdprops'>
-      <parameter type-id='type-id-27' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1047' column='1'/>
+      <parameter type-id='type-id-46' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1047' column='1'/>
       <parameter type-id='type-id-263' name='props' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1047' column='1'/>
       <parameter type-id='type-id-263' name='cmdprops' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1048' column='1'/>
       <parameter type-id='type-id-268' name='wkeydata' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1048' column='1'/>
-      <parameter type-id='type-id-55' name='wkeylen' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1048' column='1'/>
-      <parameter type-id='type-id-27' name='origin' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1048' column='1'/>
+      <parameter type-id='type-id-54' name='wkeylen' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1048' column='1'/>
+      <parameter type-id='type-id-46' name='origin' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1048' column='1'/>
       <parameter type-id='type-id-6' name='force' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1049' column='1'/>
       <parameter type-id='type-id-6' name='resumable' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1049' column='1'/>
       <parameter type-id='type-id-6' name='raw' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1049' column='1'/>
@@ -2512,14 +2496,14 @@
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_rollback' mangled-name='lzc_rollback' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1070' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_rollback'>
-      <parameter type-id='type-id-27' name='fsname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1070' column='1'/>
-      <parameter type-id='type-id-26' name='snapnamebuf' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1070' column='1'/>
+      <parameter type-id='type-id-46' name='fsname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1070' column='1'/>
+      <parameter type-id='type-id-52' name='snapnamebuf' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1070' column='1'/>
       <parameter type-id='type-id-4' name='snapnamelen' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1070' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_rollback_to' mangled-name='lzc_rollback_to' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1095' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_rollback_to'>
-      <parameter type-id='type-id-27' name='fsname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1095' column='1'/>
-      <parameter type-id='type-id-27' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1095' column='1'/>
+      <parameter type-id='type-id-46' name='fsname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1095' column='1'/>
+      <parameter type-id='type-id-46' name='snapname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1095' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_bookmark' mangled-name='lzc_bookmark' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_bookmark'>
@@ -2528,13 +2512,13 @@
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_get_bookmarks' mangled-name='lzc_get_bookmarks' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1180' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_get_bookmarks'>
-      <parameter type-id='type-id-27' name='fsname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1180' column='1'/>
+      <parameter type-id='type-id-46' name='fsname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1180' column='1'/>
       <parameter type-id='type-id-263' name='props' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1180' column='1'/>
       <parameter type-id='type-id-264' name='bmarks' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1180' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_get_bookmark_props' mangled-name='lzc_get_bookmark_props' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_get_bookmark_props'>
-      <parameter type-id='type-id-27' name='bookmark' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1201' column='1'/>
+      <parameter type-id='type-id-46' name='bookmark' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1201' column='1'/>
       <parameter type-id='type-id-264' name='props' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1201' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
@@ -2544,8 +2528,8 @@
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_channel_program' mangled-name='lzc_channel_program' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1300' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_channel_program'>
-      <parameter type-id='type-id-27' name='pool' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1300' column='1'/>
-      <parameter type-id='type-id-27' name='program' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1300' column='1'/>
+      <parameter type-id='type-id-46' name='pool' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1300' column='1'/>
+      <parameter type-id='type-id-46' name='program' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1300' column='1'/>
       <parameter type-id='type-id-174' name='instrlimit' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1300' column='1'/>
       <parameter type-id='type-id-174' name='memlimit' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1301' column='1'/>
       <parameter type-id='type-id-263' name='argnvl' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1301' column='1'/>
@@ -2553,16 +2537,16 @@
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_pool_checkpoint' mangled-name='lzc_pool_checkpoint' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1331' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_pool_checkpoint'>
-      <parameter type-id='type-id-27' name='pool' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1331' column='1'/>
+      <parameter type-id='type-id-46' name='pool' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1331' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_pool_checkpoint_discard' mangled-name='lzc_pool_checkpoint_discard' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1360' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_pool_checkpoint_discard'>
-      <parameter type-id='type-id-27' name='pool' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1360' column='1'/>
+      <parameter type-id='type-id-46' name='pool' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1360' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_channel_program_nosync' mangled-name='lzc_channel_program_nosync' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1388' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_channel_program_nosync'>
-      <parameter type-id='type-id-27' name='pool' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1388' column='1'/>
-      <parameter type-id='type-id-27' name='program' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1388' column='1'/>
+      <parameter type-id='type-id-46' name='pool' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1388' column='1'/>
+      <parameter type-id='type-id-46' name='program' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1388' column='1'/>
       <parameter type-id='type-id-174' name='timeout' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1389' column='1'/>
       <parameter type-id='type-id-174' name='memlimit' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1389' column='1'/>
       <parameter type-id='type-id-263' name='argnvl' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1389' column='1'/>
@@ -2570,38 +2554,38 @@
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_load_key' mangled-name='lzc_load_key' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1403' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_load_key'>
-      <parameter type-id='type-id-27' name='fsname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1403' column='1'/>
+      <parameter type-id='type-id-46' name='fsname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1403' column='1'/>
       <parameter type-id='type-id-6' name='noop' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1403' column='1'/>
       <parameter type-id='type-id-268' name='wkeydata' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1403' column='1'/>
-      <parameter type-id='type-id-55' name='wkeylen' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1404' column='1'/>
+      <parameter type-id='type-id-54' name='wkeylen' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1404' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_unload_key' mangled-name='lzc_unload_key' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1427' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_unload_key'>
-      <parameter type-id='type-id-27' name='fsname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1427' column='1'/>
+      <parameter type-id='type-id-46' name='fsname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1427' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_change_key' mangled-name='lzc_change_key' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1433' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_change_key'>
-      <parameter type-id='type-id-27' name='fsname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1433' column='1'/>
+      <parameter type-id='type-id-46' name='fsname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1433' column='1'/>
       <parameter type-id='type-id-174' name='crypt_cmd' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1433' column='1'/>
       <parameter type-id='type-id-263' name='props' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1433' column='1'/>
       <parameter type-id='type-id-268' name='wkeydata' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1434' column='1'/>
-      <parameter type-id='type-id-55' name='wkeylen' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1434' column='1'/>
+      <parameter type-id='type-id-54' name='wkeylen' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1434' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_reopen' mangled-name='lzc_reopen' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_reopen'>
-      <parameter type-id='type-id-27' name='pool_name' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1460' column='1'/>
+      <parameter type-id='type-id-46' name='pool_name' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1460' column='1'/>
       <parameter type-id='type-id-6' name='scrub_restart' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1460' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_initialize' mangled-name='lzc_initialize' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1495' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_initialize'>
-      <parameter type-id='type-id-27' name='poolname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1495' column='1'/>
+      <parameter type-id='type-id-46' name='poolname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1495' column='1'/>
       <parameter type-id='type-id-204' name='cmd_type' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1495' column='1'/>
       <parameter type-id='type-id-263' name='vdevs' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1496' column='1'/>
       <parameter type-id='type-id-264' name='errlist' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1496' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_trim' mangled-name='lzc_trim' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1535' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_trim'>
-      <parameter type-id='type-id-27' name='poolname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1535' column='1'/>
+      <parameter type-id='type-id-46' name='poolname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1535' column='1'/>
       <parameter type-id='type-id-206' name='cmd_type' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1535' column='1'/>
       <parameter type-id='type-id-174' name='rate' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1535' column='1'/>
       <parameter type-id='type-id-6' name='secure' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1536' column='1'/>
@@ -2610,37 +2594,37 @@
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_redact' mangled-name='lzc_redact' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1558' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_redact'>
-      <parameter type-id='type-id-27' name='snapshot' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1558' column='1'/>
-      <parameter type-id='type-id-27' name='bookname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1558' column='1'/>
+      <parameter type-id='type-id-46' name='snapshot' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1558' column='1'/>
+      <parameter type-id='type-id-46' name='bookname' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1558' column='1'/>
       <parameter type-id='type-id-263' name='snapnv' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1558' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_wait' mangled-name='lzc_wait' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_wait'>
-      <parameter type-id='type-id-27' name='pool' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1592' column='1'/>
+      <parameter type-id='type-id-46' name='pool' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1592' column='1'/>
       <parameter type-id='type-id-207' name='activity' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1592' column='1'/>
       <parameter type-id='type-id-257' name='waited' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1592' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_wait_tag' mangled-name='lzc_wait_tag' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1598' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_wait_tag'>
-      <parameter type-id='type-id-27' name='pool' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1598' column='1'/>
+      <parameter type-id='type-id-46' name='pool' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1598' column='1'/>
       <parameter type-id='type-id-207' name='activity' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1598' column='1'/>
       <parameter type-id='type-id-174' name='tag' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1598' column='1'/>
       <parameter type-id='type-id-257' name='waited' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1599' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_wait_fs' mangled-name='lzc_wait_fs' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1605' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_wait_fs'>
-      <parameter type-id='type-id-27' name='fs' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1605' column='1'/>
+      <parameter type-id='type-id-46' name='fs' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1605' column='1'/>
       <parameter type-id='type-id-209' name='activity' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1605' column='1'/>
       <parameter type-id='type-id-257' name='waited' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1605' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_set_bootenv' mangled-name='lzc_set_bootenv' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1628' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_set_bootenv'>
-      <parameter type-id='type-id-27' name='pool' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1628' column='1'/>
+      <parameter type-id='type-id-46' name='pool' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1628' column='1'/>
       <parameter type-id='type-id-262' name='env' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1628' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='lzc_get_bootenv' mangled-name='lzc_get_bootenv' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1637' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_get_bootenv'>
-      <parameter type-id='type-id-27' name='pool' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1637' column='1'/>
+      <parameter type-id='type-id-46' name='pool' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1637' column='1'/>
       <parameter type-id='type-id-264' name='outnvl' filepath='/home/hutter/release20/zfs/lib/libzfs_core/libzfs_core.c' line='1637' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
@@ -2656,7 +2640,7 @@
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='malloc' filepath='/usr/include/stdlib.h' line='539' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-28'/>
+      <parameter type-id='type-id-26'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='free' filepath='/usr/include/stdlib.h' line='554' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2664,23 +2648,23 @@
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='getenv' filepath='/usr/include/stdlib.h' line='639' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-27'/>
-      <return type-id='type-id-26'/>
+      <parameter type-id='type-id-46'/>
+      <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='strchr' filepath='/usr/include/string.h' line='230' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-4'/>
-      <return type-id='type-id-26'/>
+      <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='strrchr' filepath='/usr/include/string.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-4'/>
-      <return type-id='type-id-26'/>
+      <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='strcspn' filepath='/usr/include/string.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-27'/>
-      <return type-id='type-id-28'/>
+      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-46'/>
+      <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='close' filepath='/usr/include/unistd.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
@@ -2689,12 +2673,12 @@
     <function-decl name='read' filepath='/usr/include/unistd.h' line='371' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-2'/>
-      <parameter type-id='type-id-28'/>
-      <return type-id='type-id-29'/>
+      <parameter type-id='type-id-26'/>
+      <return type-id='type-id-27'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='os/linux/zutil_device_path_os.c' comp-dir-path='/home/hutter/release20/zfs/lib/libzutil' language='LANG_C99'>
-    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='288' id='type-id-270'>
+    <array-type-def dimensions='1' type-id='type-id-48' size-in-bits='288' id='type-id-270'>
       <subrange length='36' type-id='type-id-10' id='type-id-271'/>
     </array-type-def>
     <class-decl name='udev' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-272'/>
@@ -2703,10 +2687,10 @@
       <subrange length='1' type-id='type-id-10' id='type-id-78'/>
     </array-type-def>
     <type-decl name='long long int' size-in-bits='64' id='type-id-106'/>
-    <array-type-def dimensions='1' type-id='type-id-55' size-in-bits='384' id='type-id-276'>
+    <array-type-def dimensions='1' type-id='type-id-54' size-in-bits='384' id='type-id-276'>
       <subrange length='12' type-id='type-id-10' id='type-id-181'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-55' size-in-bits='256' id='type-id-277'>
+    <array-type-def dimensions='1' type-id='type-id-54' size-in-bits='256' id='type-id-277'>
       <subrange length='8' type-id='type-id-10' id='type-id-84'/>
     </array-type-def>
     <class-decl name='dk_part' size-in-bits='960' is-struct='yes' visibility='default' filepath='../../include/sys/efi_partition.h' line='301' column='1' id='type-id-274'>
@@ -2737,16 +2721,16 @@
     </class-decl>
     <class-decl name='dk_gpt' size-in-bits='1920' is-struct='yes' visibility='default' filepath='../../include/sys/efi_partition.h' line='316' column='1' id='type-id-281'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='efi_version' type-id='type-id-55' visibility='default' filepath='../../include/sys/efi_partition.h' line='317' column='1'/>
+        <var-decl name='efi_version' type-id='type-id-54' visibility='default' filepath='../../include/sys/efi_partition.h' line='317' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='efi_nparts' type-id='type-id-55' visibility='default' filepath='../../include/sys/efi_partition.h' line='318' column='1'/>
+        <var-decl name='efi_nparts' type-id='type-id-54' visibility='default' filepath='../../include/sys/efi_partition.h' line='318' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='efi_part_size' type-id='type-id-55' visibility='default' filepath='../../include/sys/efi_partition.h' line='319' column='1'/>
+        <var-decl name='efi_part_size' type-id='type-id-54' visibility='default' filepath='../../include/sys/efi_partition.h' line='319' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='efi_lbasize' type-id='type-id-55' visibility='default' filepath='../../include/sys/efi_partition.h' line='321' column='1'/>
+        <var-decl name='efi_lbasize' type-id='type-id-54' visibility='default' filepath='../../include/sys/efi_partition.h' line='321' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='efi_last_lba' type-id='type-id-278' visibility='default' filepath='../../include/sys/efi_partition.h' line='322' column='1'/>
@@ -2761,10 +2745,10 @@
         <var-decl name='efi_disk_uguid' type-id='type-id-279' visibility='default' filepath='../../include/sys/efi_partition.h' line='325' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='efi_flags' type-id='type-id-55' visibility='default' filepath='../../include/sys/efi_partition.h' line='326' column='1'/>
+        <var-decl name='efi_flags' type-id='type-id-54' visibility='default' filepath='../../include/sys/efi_partition.h' line='326' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='480'>
-        <var-decl name='efi_reserved1' type-id='type-id-55' visibility='default' filepath='../../include/sys/efi_partition.h' line='327' column='1'/>
+        <var-decl name='efi_reserved1' type-id='type-id-54' visibility='default' filepath='../../include/sys/efi_partition.h' line='327' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <var-decl name='efi_altern_lba' type-id='type-id-278' visibility='default' filepath='../../include/sys/efi_partition.h' line='328' column='1'/>
@@ -2844,52 +2828,62 @@
     </function-decl>
     <function-decl name='udev_device_new_from_subsystem_sysname' filepath='/usr/include/libudev.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-289'/>
-      <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-46'/>
       <return type-id='type-id-290'/>
     </function-decl>
     <function-decl name='udev_device_get_property_value' filepath='/usr/include/libudev.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-290'/>
-      <parameter type-id='type-id-27'/>
-      <return type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
+      <return type-id='type-id-46'/>
+    </function-decl>
+    <function-decl name='fclose' filepath='/usr/include/stdio.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-60'/>
+      <return type-id='type-id-4'/>
+    </function-decl>
+    <function-decl name='fgets' filepath='/usr/include/stdio.h' line='586' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-4'/>
+      <parameter type-id='type-id-28'/>
+      <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='strstr' filepath='/usr/include/string.h' line='334' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-27'/>
-      <return type-id='type-id-26'/>
+      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-46'/>
+      <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='readlink' filepath='/usr/include/unistd.h' line='837' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-31'/>
-      <parameter type-id='type-id-48'/>
-      <parameter type-id='type-id-28'/>
-      <return type-id='type-id-29'/>
+      <parameter type-id='type-id-29'/>
+      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-26'/>
+      <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='zfs_strip_partition' mangled-name='zfs_strip_partition' filepath='os/linux/zutil_device_path_os.c' line='84' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_strip_partition'>
-      <parameter type-id='type-id-26' name='path' filepath='os/linux/zutil_device_path_os.c' line='84' column='1'/>
-      <return type-id='type-id-26'/>
+      <parameter type-id='type-id-52' name='path' filepath='os/linux/zutil_device_path_os.c' line='84' column='1'/>
+      <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='zfs_strip_path' mangled-name='zfs_strip_path' filepath='os/linux/zutil_device_path_os.c' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_strip_path'>
-      <parameter type-id='type-id-26' name='path' filepath='os/linux/zutil_device_path_os.c' line='152' column='1'/>
-      <return type-id='type-id-26'/>
+      <parameter type-id='type-id-52' name='path' filepath='os/linux/zutil_device_path_os.c' line='152' column='1'/>
+      <return type-id='type-id-52'/>
     </function-decl>
-    <function-decl name='zfs_get_enclosure_sysfs_path' mangled-name='zfs_get_enclosure_sysfs_path' filepath='os/linux/zutil_device_path_os.c' line='171' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_get_enclosure_sysfs_path'>
-      <parameter type-id='type-id-27' name='dev_name' filepath='os/linux/zutil_device_path_os.c' line='171' column='1'/>
-      <return type-id='type-id-26'/>
+    <function-decl name='zfs_get_enclosure_sysfs_path' mangled-name='zfs_get_enclosure_sysfs_path' filepath='os/linux/zutil_device_path_os.c' line='301' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_get_enclosure_sysfs_path'>
+      <parameter type-id='type-id-46' name='dev_name' filepath='os/linux/zutil_device_path_os.c' line='301' column='1'/>
+      <return type-id='type-id-52'/>
     </function-decl>
-    <function-decl name='zfs_dev_is_dm' mangled-name='zfs_dev_is_dm' filepath='os/linux/zutil_device_path_os.c' line='363' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_dev_is_dm'>
-      <parameter type-id='type-id-27' name='dev_name' filepath='os/linux/zutil_device_path_os.c' line='363' column='1'/>
+    <function-decl name='zfs_dev_is_dm' mangled-name='zfs_dev_is_dm' filepath='os/linux/zutil_device_path_os.c' line='503' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_dev_is_dm'>
+      <parameter type-id='type-id-46' name='dev_name' filepath='os/linux/zutil_device_path_os.c' line='503' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='zfs_dev_is_whole_disk' mangled-name='zfs_dev_is_whole_disk' filepath='os/linux/zutil_device_path_os.c' line='384' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_dev_is_whole_disk'>
-      <parameter type-id='type-id-27' name='dev_name' filepath='os/linux/zutil_device_path_os.c' line='384' column='1'/>
+    <function-decl name='zfs_dev_is_whole_disk' mangled-name='zfs_dev_is_whole_disk' filepath='os/linux/zutil_device_path_os.c' line='524' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_dev_is_whole_disk'>
+      <parameter type-id='type-id-46' name='dev_name' filepath='os/linux/zutil_device_path_os.c' line='524' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='zfs_get_underlying_path' mangled-name='zfs_get_underlying_path' filepath='os/linux/zutil_device_path_os.c' line='444' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_get_underlying_path'>
-      <parameter type-id='type-id-27' name='dev_name' filepath='os/linux/zutil_device_path_os.c' line='444' column='1'/>
-      <return type-id='type-id-26'/>
+    <function-decl name='zfs_get_underlying_path' mangled-name='zfs_get_underlying_path' filepath='os/linux/zutil_device_path_os.c' line='584' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_get_underlying_path'>
+      <parameter type-id='type-id-46' name='dev_name' filepath='os/linux/zutil_device_path_os.c' line='584' column='1'/>
+      <return type-id='type-id-52'/>
     </function-decl>
-    <function-decl name='is_mpath_whole_disk' mangled-name='is_mpath_whole_disk' filepath='os/linux/zutil_device_path_os.c' line='498' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='is_mpath_whole_disk'>
-      <parameter type-id='type-id-27' name='path' filepath='os/linux/zutil_device_path_os.c' line='498' column='1'/>
+    <function-decl name='is_mpath_whole_disk' mangled-name='is_mpath_whole_disk' filepath='os/linux/zutil_device_path_os.c' line='638' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='is_mpath_whole_disk'>
+      <parameter type-id='type-id-46' name='path' filepath='os/linux/zutil_device_path_os.c' line='638' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <type-decl name='unsigned short int' size-in-bits='16' id='type-id-282'/>
@@ -2919,7 +2913,7 @@
     <class-decl name='udev_list_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-294'/>
     <function-decl name='nvlist_remove_all' filepath='../../include/sys/nvpair.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='blkid_put_cache' filepath='/usr/include/blkid/blkid.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2928,12 +2922,12 @@
     </function-decl>
     <function-decl name='blkid_get_cache' filepath='/usr/include/blkid/blkid.h' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-304'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='blkid_dev_devname' filepath='/usr/include/blkid/blkid.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-299'/>
-      <return type-id='type-id-27'/>
+      <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='blkid_dev_iterate_begin' filepath='/usr/include/blkid/blkid.h' line='152' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-301'/>
@@ -2941,8 +2935,8 @@
     </function-decl>
     <function-decl name='blkid_dev_set_search' filepath='/usr/include/blkid/blkid.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-303'/>
-      <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-46'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='blkid_dev_next' filepath='/usr/include/blkid/blkid.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2968,12 +2962,12 @@
     </function-decl>
     <function-decl name='udev_list_entry_get_name' filepath='/usr/include/libudev.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-308'/>
-      <return type-id='type-id-27'/>
+      <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='udev_device_get_parent_with_subsystem_devtype' filepath='/usr/include/libudev.h' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-290'/>
-      <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-46'/>
       <return type-id='type-id-290'/>
     </function-decl>
     <function-decl name='udev_device_get_devlinks_list_entry' filepath='/usr/include/libudev.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2984,19 +2978,19 @@
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='strtoul' filepath='/usr/include/stdlib.h' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-29'/>
       <parameter type-id='type-id-309'/>
       <parameter type-id='type-id-4'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='strncasecmp' filepath='/usr/include/strings.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-28'/>
+      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-26'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='stat64' filepath='/usr/include/sys/stat.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-29'/>
       <parameter type-id='type-id-306'/>
       <return type-id='type-id-4'/>
     </function-decl>
@@ -3015,87 +3009,87 @@
     </function-decl>
     <function-decl name='zfs_device_get_devid' mangled-name='zfs_device_get_devid' filepath='os/linux/zutil_import_os.c' line='412' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_device_get_devid'>
       <parameter type-id='type-id-290' name='dev' filepath='os/linux/zutil_import_os.c' line='412' column='1'/>
-      <parameter type-id='type-id-26' name='bufptr' filepath='os/linux/zutil_import_os.c' line='412' column='1'/>
-      <parameter type-id='type-id-28' name='buflen' filepath='os/linux/zutil_import_os.c' line='412' column='1'/>
+      <parameter type-id='type-id-52' name='bufptr' filepath='os/linux/zutil_import_os.c' line='412' column='1'/>
+      <parameter type-id='type-id-26' name='buflen' filepath='os/linux/zutil_import_os.c' line='412' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='zfs_device_get_physical' mangled-name='zfs_device_get_physical' filepath='os/linux/zutil_import_os.c' line='489' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_device_get_physical'>
       <parameter type-id='type-id-290' name='dev' filepath='os/linux/zutil_import_os.c' line='489' column='1'/>
-      <parameter type-id='type-id-26' name='bufptr' filepath='os/linux/zutil_import_os.c' line='489' column='1'/>
-      <parameter type-id='type-id-28' name='buflen' filepath='os/linux/zutil_import_os.c' line='489' column='1'/>
+      <parameter type-id='type-id-52' name='bufptr' filepath='os/linux/zutil_import_os.c' line='489' column='1'/>
+      <parameter type-id='type-id-26' name='buflen' filepath='os/linux/zutil_import_os.c' line='489' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='zpool_label_disk_wait' mangled-name='zpool_label_disk_wait' filepath='os/linux/zutil_import_os.c' line='608' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zpool_label_disk_wait'>
-      <parameter type-id='type-id-27' name='path' filepath='os/linux/zutil_import_os.c' line='608' column='1'/>
+      <parameter type-id='type-id-46' name='path' filepath='os/linux/zutil_import_os.c' line='608' column='1'/>
       <parameter type-id='type-id-4' name='timeout_ms' filepath='os/linux/zutil_import_os.c' line='608' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='zutil_device_path.c' comp-dir-path='/home/hutter/release20/zfs/lib/libzutil' language='LANG_C99'>
-    <qualified-type-def type-id='type-id-26' restrict='yes' id='type-id-48'/>
-    <qualified-type-def type-id='type-id-27' const='yes' id='type-id-310'/>
+    <qualified-type-def type-id='type-id-52' restrict='yes' id='type-id-47'/>
+    <qualified-type-def type-id='type-id-46' const='yes' id='type-id-310'/>
     <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-311'/>
-    <qualified-type-def type-id='type-id-27' restrict='yes' id='type-id-31'/>
+    <qualified-type-def type-id='type-id-46' restrict='yes' id='type-id-29'/>
     <function-decl name='zpool_default_search_paths' mangled-name='zpool_default_search_paths' filepath='../../include/libzutil.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zpool_default_search_paths'>
       <parameter type-id='type-id-153'/>
       <return type-id='type-id-311'/>
     </function-decl>
     <function-decl name='zfs_append_partition' mangled-name='zfs_append_partition' filepath='../../include/libzutil.h' line='96' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_append_partition'>
+      <parameter type-id='type-id-52'/>
       <parameter type-id='type-id-26'/>
-      <parameter type-id='type-id-28'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='strlcat' mangled-name='strlcat' filepath='../../lib/libspl/include/string.h' line='33' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strlcat'>
+      <parameter type-id='type-id-52'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-26'/>
-      <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-28'/>
-      <return type-id='type-id-28'/>
+      <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='zfs_resolve_shortname' mangled-name='zfs_resolve_shortname' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_device_path.c' line='41' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_resolve_shortname'>
-      <parameter type-id='type-id-27' name='name' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_device_path.c' line='41' column='1'/>
-      <parameter type-id='type-id-26' name='path' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_device_path.c' line='41' column='1'/>
-      <parameter type-id='type-id-28' name='len' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_device_path.c' line='41' column='1'/>
+      <parameter type-id='type-id-46' name='name' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_device_path.c' line='41' column='1'/>
+      <parameter type-id='type-id-52' name='path' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_device_path.c' line='41' column='1'/>
+      <parameter type-id='type-id-26' name='len' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_device_path.c' line='41' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='zfs_strcmp_pathname' mangled-name='zfs_strcmp_pathname' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_device_path.c' line='139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_strcmp_pathname'>
-      <parameter type-id='type-id-27' name='name' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_device_path.c' line='139' column='1'/>
-      <parameter type-id='type-id-27' name='cmp' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_device_path.c' line='139' column='1'/>
+      <parameter type-id='type-id-46' name='name' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_device_path.c' line='139' column='1'/>
+      <parameter type-id='type-id-46' name='cmp' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_device_path.c' line='139' column='1'/>
       <parameter type-id='type-id-4' name='wholedisk' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_device_path.c' line='139' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='snprintf' filepath='/usr/include/stdio.h' line='372' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-52'/>
       <parameter type-id='type-id-26'/>
-      <parameter type-id='type-id-28'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='memset' filepath='/usr/include/string.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-4'/>
-      <parameter type-id='type-id-28'/>
+      <parameter type-id='type-id-26'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='strcmp' filepath='/usr/include/string.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-46'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='strdup' filepath='/usr/include/string.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-27'/>
-      <return type-id='type-id-26'/>
+      <parameter type-id='type-id-46'/>
+      <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='strtok' filepath='/usr/include/string.h' line='340' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-48'/>
-      <parameter type-id='type-id-31'/>
-      <return type-id='type-id-26'/>
+      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-29'/>
+      <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='strlen' filepath='/usr/include/string.h' line='391' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-27'/>
-      <return type-id='type-id-28'/>
+      <parameter type-id='type-id-46'/>
+      <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='access' filepath='/usr/include/unistd.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-4'/>
       <return type-id='type-id-4'/>
     </function-decl>
@@ -3107,19 +3101,19 @@
     <array-type-def dimensions='1' type-id='type-id-314' size-in-bits='128' id='type-id-315'>
       <subrange length='2' type-id='type-id-10' id='type-id-86'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='8192' id='type-id-316'>
+    <array-type-def dimensions='1' type-id='type-id-48' size-in-bits='8192' id='type-id-316'>
       <subrange length='1024' type-id='type-id-10' id='type-id-317'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='8' id='type-id-318'>
+    <array-type-def dimensions='1' type-id='type-id-48' size-in-bits='8' id='type-id-318'>
       <subrange length='1' type-id='type-id-10' id='type-id-78'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='160' id='type-id-319'>
+    <array-type-def dimensions='1' type-id='type-id-48' size-in-bits='160' id='type-id-319'>
       <subrange length='20' type-id='type-id-10' id='type-id-320'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='32' id='type-id-102'>
+    <array-type-def dimensions='1' type-id='type-id-48' size-in-bits='32' id='type-id-102'>
       <subrange length='4' type-id='type-id-10' id='type-id-89'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='448' id='type-id-321'>
+    <array-type-def dimensions='1' type-id='type-id-48' size-in-bits='448' id='type-id-321'>
       <subrange length='56' type-id='type-id-10' id='type-id-322'/>
     </array-type-def>
     <class-decl name='_IO_codecvt' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-323'/>
@@ -3175,7 +3169,7 @@
         <var-decl name='tp_flags' type-id='type-id-4' visibility='default' filepath='/home/hutter/release20/zfs/lib/libtpool/thread_pool_impl.h' line='74' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2272'>
-        <var-decl name='tp_linger' type-id='type-id-55' visibility='default' filepath='/home/hutter/release20/zfs/lib/libtpool/thread_pool_impl.h' line='75' column='1'/>
+        <var-decl name='tp_linger' type-id='type-id-54' visibility='default' filepath='/home/hutter/release20/zfs/lib/libtpool/thread_pool_impl.h' line='75' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
         <var-decl name='tp_njobs' type-id='type-id-4' visibility='default' filepath='/home/hutter/release20/zfs/lib/libtpool/thread_pool_impl.h' line='76' column='1'/>
@@ -3215,13 +3209,13 @@
         <var-decl name='paths' type-id='type-id-4' visibility='default' filepath='../../include/libzutil.h' line='64' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='poolname' type-id='type-id-27' visibility='default' filepath='../../include/libzutil.h' line='65' column='1'/>
+        <var-decl name='poolname' type-id='type-id-46' visibility='default' filepath='../../include/libzutil.h' line='65' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='guid' type-id='type-id-174' visibility='default' filepath='../../include/libzutil.h' line='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='cachefile' type-id='type-id-27' visibility='default' filepath='../../include/libzutil.h' line='67' column='1'/>
+        <var-decl name='cachefile' type-id='type-id-46' visibility='default' filepath='../../include/libzutil.h' line='67' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <var-decl name='can_be_active' type-id='type-id-6' visibility='default' filepath='../../include/libzutil.h' line='68' column='1'/>
@@ -3253,13 +3247,13 @@
         <var-decl name='avl_compar' type-id='type-id-347' visibility='default' filepath='../../include/sys/avl_impl.h' line='148' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='avl_offset' type-id='type-id-28' visibility='default' filepath='../../include/sys/avl_impl.h' line='149' column='1'/>
+        <var-decl name='avl_offset' type-id='type-id-26' visibility='default' filepath='../../include/sys/avl_impl.h' line='149' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='avl_numnodes' type-id='type-id-7' visibility='default' filepath='../../include/sys/avl_impl.h' line='150' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='avl_size' type-id='type-id-28' visibility='default' filepath='../../include/sys/avl_impl.h' line='151' column='1'/>
+        <var-decl name='avl_size' type-id='type-id-26' visibility='default' filepath='../../include/sys/avl_impl.h' line='151' column='1'/>
       </data-member>
     </class-decl>
     <typedef-decl name='tpool_t' type-id='type-id-162' filepath='../../include/thread_pool.h' line='38' column='1' id='type-id-161'/>
@@ -3331,7 +3325,7 @@
         <var-decl name='st_nlink' type-id='type-id-357' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='44' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='st_mode' type-id='type-id-40' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='45' column='1'/>
+        <var-decl name='st_mode' type-id='type-id-38' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='45' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <var-decl name='st_uid' type-id='type-id-358' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='47' column='1'/>
@@ -3378,7 +3372,7 @@
         <var-decl name='st_nlink' type-id='type-id-357' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='111' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='st_mode' type-id='type-id-40' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='112' column='1'/>
+        <var-decl name='st_mode' type-id='type-id-38' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='112' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <var-decl name='st_uid' type-id='type-id-358' visibility='default' filepath='/usr/include/bits/struct_stat.h' line='119' column='1'/>
@@ -3419,7 +3413,7 @@
     <typedef-decl name='__gid_t' type-id='type-id-15' filepath='/usr/include/bits/types.h' line='147' column='1' id='type-id-359'/>
     <typedef-decl name='__ino_t' type-id='type-id-10' filepath='/usr/include/bits/types.h' line='148' column='1' id='type-id-356'/>
     <typedef-decl name='__ino64_t' type-id='type-id-10' filepath='/usr/include/bits/types.h' line='149' column='1' id='type-id-285'/>
-    <typedef-decl name='__mode_t' type-id='type-id-15' filepath='/usr/include/bits/types.h' line='150' column='1' id='type-id-40'/>
+    <typedef-decl name='__mode_t' type-id='type-id-15' filepath='/usr/include/bits/types.h' line='150' column='1' id='type-id-38'/>
     <typedef-decl name='__nlink_t' type-id='type-id-10' filepath='/usr/include/bits/types.h' line='151' column='1' id='type-id-357'/>
     <typedef-decl name='__off_t' type-id='type-id-65' filepath='/usr/include/bits/types.h' line='152' column='1' id='type-id-360'/>
     <typedef-decl name='__off64_t' type-id='type-id-65' filepath='/usr/include/bits/types.h' line='153' column='1' id='type-id-286'/>
@@ -3435,37 +3429,37 @@
         <var-decl name='_flags' type-id='type-id-4' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='_IO_read_ptr' type-id='type-id-26' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='54' column='1'/>
+        <var-decl name='_IO_read_ptr' type-id='type-id-52' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='_IO_read_end' type-id='type-id-26' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='55' column='1'/>
+        <var-decl name='_IO_read_end' type-id='type-id-52' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='_IO_read_base' type-id='type-id-26' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='56' column='1'/>
+        <var-decl name='_IO_read_base' type-id='type-id-52' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='_IO_write_base' type-id='type-id-26' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='57' column='1'/>
+        <var-decl name='_IO_write_base' type-id='type-id-52' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='_IO_write_ptr' type-id='type-id-26' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='58' column='1'/>
+        <var-decl name='_IO_write_ptr' type-id='type-id-52' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='58' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='_IO_write_end' type-id='type-id-26' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='59' column='1'/>
+        <var-decl name='_IO_write_end' type-id='type-id-52' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='59' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='_IO_buf_base' type-id='type-id-26' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='60' column='1'/>
+        <var-decl name='_IO_buf_base' type-id='type-id-52' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='60' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='_IO_buf_end' type-id='type-id-26' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='61' column='1'/>
+        <var-decl name='_IO_buf_end' type-id='type-id-52' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='_IO_save_base' type-id='type-id-26' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='64' column='1'/>
+        <var-decl name='_IO_save_base' type-id='type-id-52' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='64' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='_IO_backup_base' type-id='type-id-26' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='65' column='1'/>
+        <var-decl name='_IO_backup_base' type-id='type-id-52' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='65' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='_IO_save_end' type-id='type-id-26' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='66' column='1'/>
+        <var-decl name='_IO_save_end' type-id='type-id-52' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <var-decl name='_markers' type-id='type-id-368' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='68' column='1'/>
@@ -3510,7 +3504,7 @@
         <var-decl name='_freeres_buf' type-id='type-id-2' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='94' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='__pad5' type-id='type-id-28' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='95' column='1'/>
+        <var-decl name='__pad5' type-id='type-id-26' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='95' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
         <var-decl name='_mode' type-id='type-id-4' visibility='default' filepath='/usr/include/bits/types/struct_FILE.h' line='96' column='1'/>
@@ -3530,20 +3524,20 @@
     <typedef-decl name='DIR' type-id='type-id-326' filepath='/usr/include/dirent.h' line='127' column='1' id='type-id-373'/>
     <typedef-decl name='uintptr_t' type-id='type-id-10' filepath='/usr/include/stdint.h' line='90' column='1' id='type-id-345'/>
     <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-374'/>
-    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-49'/>
-    <qualified-type-def type-id='type-id-49' restrict='yes' id='type-id-30'/>
+    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-60'/>
+    <qualified-type-def type-id='type-id-60' restrict='yes' id='type-id-28'/>
     <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-369'/>
     <pointer-type-def type-id='type-id-323' size-in-bits='64' id='type-id-371'/>
     <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-370'/>
     <pointer-type-def type-id='type-id-324' size-in-bits='64' id='type-id-368'/>
     <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-372'/>
-    <pointer-type-def type-id='type-id-327' size-in-bits='64' id='type-id-32'/>
+    <pointer-type-def type-id='type-id-327' size-in-bits='64' id='type-id-30'/>
     <pointer-type-def type-id='type-id-3' size-in-bits='64' id='type-id-375'/>
     <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-314'/>
     <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-376'/>
     <pointer-type-def type-id='type-id-344' size-in-bits='64' id='type-id-1'/>
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-377'/>
-    <pointer-type-def type-id='type-id-26' size-in-bits='64' id='type-id-339'/>
+    <pointer-type-def type-id='type-id-52' size-in-bits='64' id='type-id-339'/>
     <qualified-type-def type-id='type-id-339' restrict='yes' id='type-id-309'/>
     <qualified-type-def type-id='type-id-333' const='yes' id='type-id-336'/>
     <qualified-type-def type-id='type-id-352' const='yes' id='type-id-378'/>
@@ -3563,7 +3557,7 @@
     <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-62'/>
     <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-160'/>
     <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-388'/>
-    <pointer-type-def type-id='type-id-55' size-in-bits='64' id='type-id-389'/>
+    <pointer-type-def type-id='type-id-54' size-in-bits='64' id='type-id-389'/>
     <pointer-type-def type-id='type-id-164' size-in-bits='64' id='type-id-93'/>
     <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-158'/>
     <class-decl name='_IO_codecvt' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-323'/>
@@ -3581,8 +3575,8 @@
     <function-decl name='avl_create' mangled-name='avl_create' filepath='../../include/sys/avl.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_create'>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-347'/>
-      <parameter type-id='type-id-28'/>
-      <parameter type-id='type-id-28'/>
+      <parameter type-id='type-id-26'/>
+      <parameter type-id='type-id-26'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='avl_find' mangled-name='avl_find' filepath='../../include/sys/avl.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_find'>
@@ -3618,7 +3612,7 @@
     </function-decl>
     <function-decl name='nvlist_alloc' filepath='../../include/sys/nvpair.h' line='151' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-264'/>
-      <parameter type-id='type-id-55'/>
+      <parameter type-id='type-id-54'/>
       <parameter type-id='type-id-4'/>
       <return type-id='type-id-4'/>
     </function-decl>
@@ -3630,58 +3624,58 @@
     </function-decl>
     <function-decl name='nvlist_add_uint64' filepath='../../include/sys/nvpair.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-174'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='nvlist_add_string' filepath='../../include/sys/nvpair.h' line='179' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-46'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='nvlist_add_nvlist' filepath='../../include/sys/nvpair.h' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-263'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='nvlist_add_uint64_array' filepath='../../include/sys/nvpair.h' line='190' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-267'/>
-      <parameter type-id='type-id-55'/>
+      <parameter type-id='type-id-54'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='nvlist_add_nvlist_array' filepath='../../include/sys/nvpair.h' line='192' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-264'/>
-      <parameter type-id='type-id-55'/>
+      <parameter type-id='type-id-54'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='nvlist_remove' filepath='../../include/sys/nvpair.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-211'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='nvlist_lookup_string' filepath='../../include/sys/nvpair.h' line='213' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-339'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='nvlist_lookup_uint64_array' filepath='../../include/sys/nvpair.h' line='225' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-388'/>
       <parameter type-id='type-id-389'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='nvlist_lookup_nvlist_array' filepath='../../include/sys/nvpair.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-385'/>
       <parameter type-id='type-id-389'/>
       <return type-id='type-id-4'/>
@@ -3697,7 +3691,7 @@
     </function-decl>
     <function-decl name='fnvlist_lookup_nvlist' filepath='../../include/sys/nvpair.h' line='329' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-263'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <return type-id='type-id-263'/>
     </function-decl>
     <function-decl name='fnvpair_value_nvlist' filepath='../../include/sys/nvpair.h' line='352' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3705,9 +3699,9 @@
       <return type-id='type-id-263'/>
     </function-decl>
     <function-decl name='tpool_create' mangled-name='tpool_create' filepath='../../include/thread_pool.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tpool_create'>
-      <parameter type-id='type-id-55'/>
-      <parameter type-id='type-id-55'/>
-      <parameter type-id='type-id-55'/>
+      <parameter type-id='type-id-54'/>
+      <parameter type-id='type-id-54'/>
+      <parameter type-id='type-id-54'/>
       <parameter type-id='type-id-143'/>
       <return type-id='type-id-160'/>
     </function-decl>
@@ -3726,17 +3720,17 @@
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='spl_pagesize' mangled-name='spl_pagesize' filepath='../../lib/libspl/include/os/linux/sys/param.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='spl_pagesize'>
-      <return type-id='type-id-28'/>
+      <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='zutil_alloc' mangled-name='zutil_alloc' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_import.c' line='135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zutil_alloc'>
       <parameter type-id='type-id-384' name='hdl' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_import.c' line='135' column='1'/>
-      <parameter type-id='type-id-28' name='size' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_import.c' line='135' column='1'/>
+      <parameter type-id='type-id-26' name='size' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_import.c' line='135' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='zutil_strdup' mangled-name='zutil_strdup' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_import.c' line='146' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zutil_strdup'>
       <parameter type-id='type-id-384' name='hdl' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_import.c' line='146' column='1'/>
-      <parameter type-id='type-id-27' name='str' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_import.c' line='146' column='1'/>
-      <return type-id='type-id-26'/>
+      <parameter type-id='type-id-46' name='str' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_import.c' line='146' column='1'/>
+      <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='zpool_read_label' mangled-name='zpool_read_label' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_import.c' line='887' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zpool_read_label'>
       <parameter type-id='type-id-4' name='fd' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_import.c' line='887' column='1'/>
@@ -3764,7 +3758,7 @@
     </function-decl>
     <function-decl name='zpool_find_config' mangled-name='zpool_find_config' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_import.c' line='1643' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zpool_find_config'>
       <parameter type-id='type-id-2' name='hdl' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_import.c' line='1643' column='1'/>
-      <parameter type-id='type-id-27' name='target' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_import.c' line='1643' column='1'/>
+      <parameter type-id='type-id-46' name='target' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_import.c' line='1643' column='1'/>
       <parameter type-id='type-id-264' name='configp' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_import.c' line='1643' column='1'/>
       <parameter type-id='type-id-381' name='args' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_import.c' line='1644' column='1'/>
       <parameter type-id='type-id-349' name='pco' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_import.c' line='1644' column='1'/>
@@ -3794,7 +3788,7 @@
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='opendir' filepath='/usr/include/dirent.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <return type-id='type-id-374'/>
     </function-decl>
     <function-decl name='closedir' filepath='/usr/include/dirent.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3806,18 +3800,18 @@
       <return type-id='type-id-380'/>
     </function-decl>
     <function-decl name='dirname' filepath='/usr/include/libgen.h' line='26' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-26'/>
-      <return type-id='type-id-26'/>
+      <parameter type-id='type-id-52'/>
+      <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='__xpg_basename' filepath='/usr/include/libgen.h' line='34' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-26'/>
-      <return type-id='type-id-26'/>
+      <parameter type-id='type-id-52'/>
+      <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='dcgettext' filepath='/usr/include/libintl.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-4'/>
-      <return type-id='type-id-26'/>
+      <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='pthread_mutex_init' filepath='/usr/include/pthread.h' line='781' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-147'/>
@@ -3829,39 +3823,39 @@
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='fprintf' filepath='/usr/include/stdio.h' line='344' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-30'/>
-      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-28'/>
+      <parameter type-id='type-id-29'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='vsnprintf' filepath='/usr/include/stdio.h' line='376' column='1' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-52'/>
       <parameter type-id='type-id-26'/>
-      <parameter type-id='type-id-28'/>
-      <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-32'/>
+      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-30'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='asprintf' filepath='/usr/include/stdio.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-309'/>
-      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-29'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='strtoull' filepath='/usr/include/stdlib.h' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-29'/>
       <parameter type-id='type-id-309'/>
       <parameter type-id='type-id-4'/>
       <return type-id='type-id-110'/>
     </function-decl>
     <function-decl name='calloc' filepath='/usr/include/stdlib.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-28'/>
-      <parameter type-id='type-id-28'/>
+      <parameter type-id='type-id-26'/>
+      <parameter type-id='type-id-26'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='posix_memalign' filepath='/usr/include/stdlib.h' line='585' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-158'/>
-      <parameter type-id='type-id-28'/>
-      <parameter type-id='type-id-28'/>
+      <parameter type-id='type-id-26'/>
+      <parameter type-id='type-id-26'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='exit' filepath='/usr/include/stdlib.h' line='622' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3869,24 +3863,24 @@
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='realpath' filepath='/usr/include/stdlib.h' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-31'/>
-      <parameter type-id='type-id-48'/>
-      <return type-id='type-id-26'/>
+      <parameter type-id='type-id-29'/>
+      <parameter type-id='type-id-47'/>
+      <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='strncmp' filepath='/usr/include/string.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-28'/>
+      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-26'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='strpbrk' filepath='/usr/include/string.h' line='307' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-27'/>
-      <parameter type-id='type-id-27'/>
-      <return type-id='type-id-26'/>
+      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-46'/>
+      <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='strerror' filepath='/usr/include/string.h' line='403' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
-      <return type-id='type-id-26'/>
+      <return type-id='type-id-52'/>
     </function-decl>
     <function-decl name='ioctl' filepath='/usr/include/sys/ioctl.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
@@ -3902,9 +3896,9 @@
     <function-decl name='pread64' filepath='/usr/include/unistd.h' line='422' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-2'/>
-      <parameter type-id='type-id-28'/>
+      <parameter type-id='type-id-26'/>
       <parameter type-id='type-id-286'/>
-      <return type-id='type-id-29'/>
+      <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='sysconf' filepath='/usr/include/unistd.h' line='640' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
@@ -3915,7 +3909,7 @@
     </function-decl>
     <function-type size-in-bits='64' id='type-id-331'>
       <parameter type-id='type-id-2'/>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-174'/>
       <parameter type-id='type-id-257'/>
       <return type-id='type-id-4'/>
@@ -3951,39 +3945,39 @@
     <qualified-type-def type-id='type-id-282' const='yes' id='type-id-393'/>
     <pointer-type-def type-id='type-id-393' size-in-bits='64' id='type-id-394'/>
     <pointer-type-def type-id='type-id-394' size-in-bits='64' id='type-id-395'/>
-    <function-decl name='zfs_isnumber' mangled-name='zfs_isnumber' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_isnumber'>
-      <parameter type-id='type-id-27' name='str' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='36' column='1'/>
+    <function-decl name='zfs_isnumber' mangled-name='zfs_isnumber' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='37' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_isnumber'>
+      <parameter type-id='type-id-46' name='str' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='37' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='zfs_nicenum_format' mangled-name='zfs_nicenum_format' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='52' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_nicenum_format'>
-      <parameter type-id='type-id-174' name='num' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='52' column='1'/>
-      <parameter type-id='type-id-26' name='buf' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='52' column='1'/>
-      <parameter type-id='type-id-28' name='buflen' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='52' column='1'/>
-      <parameter type-id='type-id-392' name='format' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='53' column='1'/>
-      <return type-id='type-id-5'/>
-    </function-decl>
-    <function-decl name='zfs_nicenum' mangled-name='zfs_nicenum' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='144' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_nicenum'>
-      <parameter type-id='type-id-174' name='num' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='144' column='1'/>
-      <parameter type-id='type-id-26' name='buf' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='144' column='1'/>
-      <parameter type-id='type-id-28' name='buflen' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='144' column='1'/>
+    <function-decl name='zfs_nicenum_format' mangled-name='zfs_nicenum_format' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_nicenum_format'>
+      <parameter type-id='type-id-174' name='num' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='61' column='1'/>
+      <parameter type-id='type-id-52' name='buf' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='61' column='1'/>
+      <parameter type-id='type-id-26' name='buflen' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='61' column='1'/>
+      <parameter type-id='type-id-392' name='format' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='62' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='zfs_nicetime' mangled-name='zfs_nicetime' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_nicetime'>
-      <parameter type-id='type-id-174' name='num' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='154' column='1'/>
-      <parameter type-id='type-id-26' name='buf' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='154' column='1'/>
-      <parameter type-id='type-id-28' name='buflen' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='154' column='1'/>
+    <function-decl name='zfs_nicenum' mangled-name='zfs_nicenum' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_nicenum'>
+      <parameter type-id='type-id-174' name='num' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='153' column='1'/>
+      <parameter type-id='type-id-52' name='buf' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='153' column='1'/>
+      <parameter type-id='type-id-26' name='buflen' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='153' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='zfs_niceraw' mangled-name='zfs_niceraw' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_niceraw'>
+    <function-decl name='zfs_nicetime' mangled-name='zfs_nicetime' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_nicetime'>
       <parameter type-id='type-id-174' name='num' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='163' column='1'/>
-      <parameter type-id='type-id-26' name='buf' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='163' column='1'/>
-      <parameter type-id='type-id-28' name='buflen' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='163' column='1'/>
+      <parameter type-id='type-id-52' name='buf' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='163' column='1'/>
+      <parameter type-id='type-id-26' name='buflen' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='163' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='zfs_nicebytes' mangled-name='zfs_nicebytes' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_nicebytes'>
+    <function-decl name='zfs_niceraw' mangled-name='zfs_niceraw' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_niceraw'>
       <parameter type-id='type-id-174' name='num' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='172' column='1'/>
-      <parameter type-id='type-id-26' name='buf' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='172' column='1'/>
-      <parameter type-id='type-id-28' name='buflen' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='172' column='1'/>
+      <parameter type-id='type-id-52' name='buf' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='172' column='1'/>
+      <parameter type-id='type-id-26' name='buflen' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='172' column='1'/>
+      <return type-id='type-id-5'/>
+    </function-decl>
+    <function-decl name='zfs_nicebytes' mangled-name='zfs_nicebytes' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_nicebytes'>
+      <parameter type-id='type-id-174' name='num' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='181' column='1'/>
+      <parameter type-id='type-id-52' name='buf' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='181' column='1'/>
+      <parameter type-id='type-id-26' name='buflen' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_nicenum.c' line='181' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='powl' filepath='/usr/include/bits/mathcalls.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4046,7 +4040,7 @@
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='zpool_history_unpack' mangled-name='zpool_history_unpack' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_pool.c' line='105' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zpool_history_unpack'>
-      <parameter type-id='type-id-26' name='buf' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_pool.c' line='105' column='1'/>
+      <parameter type-id='type-id-52' name='buf' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_pool.c' line='105' column='1'/>
       <parameter type-id='type-id-174' name='bytes_read' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_pool.c' line='105' column='1'/>
       <parameter type-id='type-id-267' name='leftover' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_pool.c' line='105' column='1'/>
       <parameter type-id='type-id-385' name='records' filepath='/home/hutter/release20/zfs/lib/libzutil/zutil_pool.c' line='106' column='1'/>
@@ -4054,13 +4048,13 @@
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='printf' filepath='/usr/include/stdio.h' line='350' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-27'/>
+      <parameter type-id='type-id-46'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='realloc' filepath='/usr/include/stdlib.h' line='550' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2'/>
-      <parameter type-id='type-id-28'/>
+      <parameter type-id='type-id-26'/>
       <return type-id='type-id-2'/>
     </function-decl>
   </abi-instr>