diff --git a/lib/libzfs/libzfs.abi b/lib/libzfs/libzfs.abi
index bc0d2ac25..4e3baee52 100644
--- a/lib/libzfs/libzfs.abi
+++ b/lib/libzfs/libzfs.abi
@@ -204,7 +204,6 @@
     <elf-symbol name='get_timestamp' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='getexecname' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='getextmntent' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='getmntany' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='getprop_uint64' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='getzoneid' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='is_mounted' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -1256,7 +1255,6 @@
     <qualified-type-def type-id='a7e325e5' restrict='yes' id='4c428e67'/>
     <qualified-type-def type-id='e05e8614' restrict='yes' id='0be2e71c'/>
     <pointer-type-def type-id='29dbc0dd' size-in-bits='64' id='068c4f7e'/>
-    <pointer-type-def type-id='b9eccc8f' size-in-bits='64' id='78830f38'/>
     <pointer-type-def type-id='62fab762' size-in-bits='64' id='db285b03'/>
     <qualified-type-def type-id='db285b03' restrict='yes' id='2a468b41'/>
     <qualified-type-def type-id='18c91f9e' restrict='yes' id='6e745582'/>
@@ -1660,21 +1658,6 @@
       <parameter type-id='18c91f9e'/>
       <return type-id='95e97e5e'/>
     </function-decl>
-    <function-decl name='mutex_init' mangled-name='mutex_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mutex_init'>
-      <parameter type-id='78830f38' name='mp'/>
-      <parameter type-id='26a90f95' name='name'/>
-      <parameter type-id='95e97e5e' name='type'/>
-      <parameter type-id='eaa32e2f' name='cookie'/>
-      <return type-id='48b5725f'/>
-    </function-decl>
-    <function-decl name='mutex_destroy' mangled-name='mutex_destroy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mutex_destroy'>
-      <parameter type-id='78830f38' name='mp'/>
-      <return type-id='48b5725f'/>
-    </function-decl>
-    <function-decl name='mutex_enter' mangled-name='mutex_enter' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mutex_enter'>
-      <parameter type-id='78830f38' name='mp'/>
-      <return type-id='48b5725f'/>
-    </function-decl>
     <function-decl name='mutex_enter_check_return' mangled-name='mutex_enter_check_return' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mutex_enter_check_return'>
       <parameter type-id='78830f38' name='mp'/>
       <return type-id='95e97e5e'/>
@@ -1683,12 +1666,8 @@
       <parameter type-id='78830f38' name='mp'/>
       <return type-id='95e97e5e'/>
     </function-decl>
-    <function-decl name='mutex_exit' mangled-name='mutex_exit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mutex_exit'>
-      <parameter type-id='78830f38' name='mp'/>
-      <return type-id='48b5725f'/>
-    </function-decl>
   </abi-instr>
-  <abi-instr address-size='64' path='lib/libspl/os/linux/getmntany.c' language='LANG_C99'>
+  <abi-instr address-size='64' path='lib/libspl/os/linux/mnttab.c' language='LANG_C99'>
     <pointer-type-def type-id='56fe4a37' size-in-bits='64' id='b6b61d2f'/>
     <qualified-type-def type-id='b6b61d2f' restrict='yes' id='3cad23cd'/>
     <function-decl name='getmntent_r' visibility='default' binding='global' size-in-bits='64'>
@@ -2344,6 +2323,15 @@
       </data-member>
     </class-decl>
     <typedef-decl name='nvlist_t' type-id='ac266fd9' id='8e8d4be3'/>
+    <class-decl name='kmutex' size-in-bits='384' is-struct='yes' visibility='default' id='f1cacfe1'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='m_lock' type-id='7a6844eb' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='m_owner' type-id='4051f5e7' visibility='default'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='kmutex_t' type-id='f1cacfe1' id='b9eccc8f'/>
     <enum-decl name='boolean_t' naming-typedef-id='c19b74c3' id='f58c8277'>
       <underlying-type type-id='9cac1fee'/>
       <enumerator name='B_FALSE' value='0'/>
@@ -2403,6 +2391,7 @@
     </class-decl>
     <typedef-decl name='regex_t' type-id='19fc9a8c' id='aca3bac8'/>
     <typedef-decl name='uintptr_t' type-id='7359adad' id='e475ab95'/>
+    <typedef-decl name='pthread_t' type-id='7359adad' id='4051f5e7'/>
     <union-decl name='pthread_mutex_t' size-in-bits='320' naming-typedef-id='7a6844eb' visibility='default' id='70681f9b'>
       <data-member access='public'>
         <var-decl name='__data' type-id='4c734837' visibility='default'/>
@@ -2488,32 +2477,29 @@
         <var-decl name='libzfs_printerr' type-id='95e97e5e' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16960'>
-        <var-decl name='libzfs_mnttab_enable' type-id='c19b74c3' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='17024'>
-        <var-decl name='libzfs_mnttab_cache_lock' type-id='7a6844eb' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='17344'>
-        <var-decl name='libzfs_mnttab_cache' type-id='f20fbd51' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='17664'>
         <var-decl name='libzfs_pool_iter' type-id='95e97e5e' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='17696'>
+      <data-member access='public' layout-offset-in-bits='16992'>
         <var-decl name='libzfs_prop_debug' type-id='c19b74c3' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='17728'>
+      <data-member access='public' layout-offset-in-bits='17024'>
         <var-decl name='libzfs_urire' type-id='aca3bac8' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='18240'>
+      <data-member access='public' layout-offset-in-bits='17536'>
         <var-decl name='libzfs_max_nvlist' type-id='9c313c2d' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='18304'>
+      <data-member access='public' layout-offset-in-bits='17600'>
         <var-decl name='libfetch' type-id='eaa32e2f' visibility='default'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='18368'>
+      <data-member access='public' layout-offset-in-bits='17664'>
         <var-decl name='libfetch_load_error' type-id='26a90f95' visibility='default'/>
       </data-member>
+      <data-member access='public' layout-offset-in-bits='17728'>
+        <var-decl name='zh_mnttab_lock' type-id='b9eccc8f' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='18112'>
+        <var-decl name='zh_mnttab' type-id='f20fbd51' visibility='default'/>
+      </data-member>
     </class-decl>
     <class-decl name='zfs_handle' size-in-bits='4928' is-struct='yes' visibility='default' id='f6ee4445'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -4113,9 +4099,6 @@
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='lib/libzfs/libzfs_dataset.c' language='LANG_C99'>
-    <array-type-def dimensions='1' type-id='a84c031d' size-in-bits='32' id='8e0573fd'>
-      <subrange length='4' type-id='7359adad' id='16fe7105'/>
-    </array-type-def>
     <class-decl name='prop_changelist' is-struct='yes' visibility='default' is-declaration-only='yes' id='d86edc51'/>
     <class-decl name='zprop_list' size-in-bits='448' is-struct='yes' visibility='default' id='bd9b4291'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -4277,15 +4260,6 @@
         <var-decl name='pw_shell' type-id='26a90f95' visibility='default'/>
       </data-member>
     </class-decl>
-    <union-decl name='pthread_mutexattr_t' size-in-bits='32' naming-typedef-id='8afd6070' visibility='default' id='7300eb00'>
-      <data-member access='public'>
-        <var-decl name='__size' type-id='8e0573fd' visibility='default'/>
-      </data-member>
-      <data-member access='public'>
-        <var-decl name='__align' type-id='95e97e5e' visibility='default'/>
-      </data-member>
-    </union-decl>
-    <typedef-decl name='pthread_mutexattr_t' type-id='7300eb00' id='8afd6070'/>
     <typedef-decl name='int64_t' type-id='0c9942d2' id='9da381c4'/>
     <typedef-decl name='__int64_t' type-id='bd54fe1a' id='0c9942d2'/>
     <typedef-decl name='__gid_t' type-id='f0981eeb' id='d94ec6d9'/>
@@ -4331,8 +4305,6 @@
     <qualified-type-def type-id='26a90f95' restrict='yes' id='266fe297'/>
     <qualified-type-def type-id='56fe4a37' const='yes' id='a75125ce'/>
     <pointer-type-def type-id='a75125ce' size-in-bits='64' id='48bea5ec'/>
-    <qualified-type-def type-id='8afd6070' const='yes' id='1d853360'/>
-    <pointer-type-def type-id='1d853360' size-in-bits='64' id='c2afbd7e'/>
     <qualified-type-def type-id='c9d12d66' const='yes' id='588b3216'/>
     <pointer-type-def type-id='588b3216' size-in-bits='64' id='9f201474'/>
     <qualified-type-def type-id='9f201474' restrict='yes' id='d6e2847c'/>
@@ -4362,6 +4334,12 @@
     <pointer-type-def type-id='bdb8ac4f' size-in-bits='64' id='3a9b2288'/>
     <pointer-type-def type-id='3a9b2288' size-in-bits='64' id='e4378506'/>
     <class-decl name='prop_changelist' is-struct='yes' visibility='default' is-declaration-only='yes' id='d86edc51'/>
+    <function-decl name='libzfs_mnttab_find' mangled-name='libzfs_mnttab_find' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='libzfs_mnttab_find'>
+      <parameter type-id='b0382bb3'/>
+      <parameter type-id='80f4b756'/>
+      <parameter type-id='9d424d31'/>
+      <return type-id='95e97e5e'/>
+    </function-decl>
     <function-decl name='zpool_open' mangled-name='zpool_open' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zpool_open'>
       <parameter type-id='b0382bb3'/>
       <parameter type-id='80f4b756'/>
@@ -4529,15 +4507,6 @@
       <parameter type-id='b59d7dce'/>
       <return type-id='48b5725f'/>
     </function-decl>
-    <function-decl name='avl_add' mangled-name='avl_add' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_add'>
-      <parameter type-id='a3681dea'/>
-      <parameter type-id='eaa32e2f'/>
-      <return type-id='48b5725f'/>
-    </function-decl>
-    <function-decl name='avl_numnodes' mangled-name='avl_numnodes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_numnodes'>
-      <parameter type-id='a3681dea'/>
-      <return type-id='ee1f298e'/>
-    </function-decl>
     <function-decl name='zfs_prop_readonly' mangled-name='zfs_prop_readonly' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_prop_readonly'>
       <parameter type-id='58603c44'/>
       <return type-id='c19b74c3'/>
@@ -4741,17 +4710,6 @@
       <parameter type-id='58603c44'/>
       <return type-id='31429eff'/>
     </function-decl>
-    <function-decl name='getmntany' mangled-name='getmntany' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getmntany'>
-      <parameter type-id='822cd80b'/>
-      <parameter type-id='9d424d31'/>
-      <parameter type-id='9d424d31'/>
-      <return type-id='95e97e5e'/>
-    </function-decl>
-    <function-decl name='_sol_getmntent' mangled-name='_sol_getmntent' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_sol_getmntent'>
-      <parameter type-id='822cd80b'/>
-      <parameter type-id='9d424d31'/>
-      <return type-id='95e97e5e'/>
-    </function-decl>
     <function-decl name='getgrnam_r' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='9d26089a'/>
       <parameter type-id='c878edd6'/>
@@ -4765,15 +4723,6 @@
       <parameter type-id='80f4b756'/>
       <return type-id='26a90f95'/>
     </function-decl>
-    <function-decl name='pthread_mutex_init' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='18c91f9e'/>
-      <parameter type-id='c2afbd7e'/>
-      <return type-id='95e97e5e'/>
-    </function-decl>
-    <function-decl name='pthread_mutex_destroy' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='18c91f9e'/>
-      <return type-id='95e97e5e'/>
-    </function-decl>
     <function-decl name='getpwnam_r' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='9d26089a'/>
       <parameter type-id='33518961'/>
@@ -4853,37 +4802,6 @@
       <parameter type-id='80f4b756' name='path'/>
       <return type-id='c19b74c3'/>
     </function-decl>
-    <function-decl name='libzfs_mnttab_init' mangled-name='libzfs_mnttab_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='libzfs_mnttab_init'>
-      <parameter type-id='b0382bb3' name='hdl'/>
-      <return type-id='48b5725f'/>
-    </function-decl>
-    <function-decl name='libzfs_mnttab_fini' mangled-name='libzfs_mnttab_fini' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='libzfs_mnttab_fini'>
-      <parameter type-id='b0382bb3' name='hdl'/>
-      <return type-id='48b5725f'/>
-    </function-decl>
-    <function-decl name='libzfs_mnttab_cache' mangled-name='libzfs_mnttab_cache' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='libzfs_mnttab_cache'>
-      <parameter type-id='b0382bb3' name='hdl'/>
-      <parameter type-id='c19b74c3' name='enable'/>
-      <return type-id='48b5725f'/>
-    </function-decl>
-    <function-decl name='libzfs_mnttab_find' mangled-name='libzfs_mnttab_find' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='libzfs_mnttab_find'>
-      <parameter type-id='b0382bb3' name='hdl'/>
-      <parameter type-id='80f4b756' name='fsname'/>
-      <parameter type-id='9d424d31' name='entry'/>
-      <return type-id='95e97e5e'/>
-    </function-decl>
-    <function-decl name='libzfs_mnttab_add' mangled-name='libzfs_mnttab_add' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='libzfs_mnttab_add'>
-      <parameter type-id='b0382bb3' name='hdl'/>
-      <parameter type-id='80f4b756' name='special'/>
-      <parameter type-id='80f4b756' name='mountp'/>
-      <parameter type-id='80f4b756' name='mntopts'/>
-      <return type-id='48b5725f'/>
-    </function-decl>
-    <function-decl name='libzfs_mnttab_remove' mangled-name='libzfs_mnttab_remove' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='libzfs_mnttab_remove'>
-      <parameter type-id='b0382bb3' name='hdl'/>
-      <parameter type-id='80f4b756' name='fsname'/>
-      <return type-id='48b5725f'/>
-    </function-decl>
     <function-decl name='zfs_spa_version' mangled-name='zfs_spa_version' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_spa_version'>
       <parameter type-id='9200a744' name='zhp'/>
       <parameter type-id='7292109c' name='spa_version'/>
@@ -5260,7 +5178,6 @@
     <array-type-def dimensions='1' type-id='a84c031d' size-in-bits='448' id='6093ff7c'>
       <subrange length='56' type-id='7359adad' id='f8137894'/>
     </array-type-def>
-    <typedef-decl name='pthread_t' type-id='7359adad' id='4051f5e7'/>
     <union-decl name='pthread_attr_t' size-in-bits='448' visibility='default' id='b63afacd'>
       <data-member access='public'>
         <var-decl name='__size' type-id='6093ff7c' visibility='default'/>
@@ -5565,6 +5482,16 @@
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='lib/libzfs/libzfs_iter.c' language='LANG_C99'>
+    <function-decl name='avl_add' mangled-name='avl_add' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_add'>
+      <parameter type-id='a3681dea'/>
+      <parameter type-id='eaa32e2f'/>
+      <return type-id='48b5725f'/>
+    </function-decl>
+    <function-decl name='_sol_getmntent' mangled-name='_sol_getmntent' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_sol_getmntent'>
+      <parameter type-id='822cd80b'/>
+      <parameter type-id='9d424d31'/>
+      <return type-id='95e97e5e'/>
+    </function-decl>
     <function-decl name='make_dataset_handle_zc' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='b0382bb3'/>
       <parameter type-id='e4ec4540'/>
@@ -5648,6 +5575,57 @@
       <return type-id='95e97e5e'/>
     </function-decl>
   </abi-instr>
+  <abi-instr address-size='64' path='lib/libzfs/libzfs_mnttab.c' language='LANG_C99'>
+    <pointer-type-def type-id='b9eccc8f' size-in-bits='64' id='78830f38'/>
+    <function-decl name='avl_numnodes' mangled-name='avl_numnodes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_numnodes'>
+      <parameter type-id='a3681dea'/>
+      <return type-id='ee1f298e'/>
+    </function-decl>
+    <function-decl name='mutex_init' mangled-name='mutex_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mutex_init'>
+      <parameter type-id='78830f38'/>
+      <parameter type-id='26a90f95'/>
+      <parameter type-id='95e97e5e'/>
+      <parameter type-id='eaa32e2f'/>
+      <return type-id='48b5725f'/>
+    </function-decl>
+    <function-decl name='mutex_destroy' mangled-name='mutex_destroy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mutex_destroy'>
+      <parameter type-id='78830f38'/>
+      <return type-id='48b5725f'/>
+    </function-decl>
+    <function-decl name='mutex_enter' mangled-name='mutex_enter' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mutex_enter'>
+      <parameter type-id='78830f38'/>
+      <return type-id='48b5725f'/>
+    </function-decl>
+    <function-decl name='mutex_exit' mangled-name='mutex_exit' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mutex_exit'>
+      <parameter type-id='78830f38'/>
+      <return type-id='48b5725f'/>
+    </function-decl>
+    <function-decl name='libzfs_mnttab_init' mangled-name='libzfs_mnttab_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='libzfs_mnttab_init'>
+      <parameter type-id='b0382bb3' name='hdl'/>
+      <return type-id='48b5725f'/>
+    </function-decl>
+    <function-decl name='libzfs_mnttab_fini' mangled-name='libzfs_mnttab_fini' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='libzfs_mnttab_fini'>
+      <parameter type-id='b0382bb3' name='hdl'/>
+      <return type-id='48b5725f'/>
+    </function-decl>
+    <function-decl name='libzfs_mnttab_cache' mangled-name='libzfs_mnttab_cache' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='libzfs_mnttab_cache'>
+      <parameter type-id='b0382bb3' name='hdl'/>
+      <parameter type-id='c19b74c3' name='enable'/>
+      <return type-id='48b5725f'/>
+    </function-decl>
+    <function-decl name='libzfs_mnttab_add' mangled-name='libzfs_mnttab_add' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='libzfs_mnttab_add'>
+      <parameter type-id='b0382bb3' name='hdl'/>
+      <parameter type-id='80f4b756' name='special'/>
+      <parameter type-id='80f4b756' name='mountp'/>
+      <parameter type-id='80f4b756' name='mntopts'/>
+      <return type-id='48b5725f'/>
+    </function-decl>
+    <function-decl name='libzfs_mnttab_remove' mangled-name='libzfs_mnttab_remove' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='libzfs_mnttab_remove'>
+      <parameter type-id='b0382bb3' name='hdl'/>
+      <parameter type-id='80f4b756' name='fsname'/>
+      <return type-id='48b5725f'/>
+    </function-decl>
+  </abi-instr>
   <abi-instr address-size='64' path='lib/libzfs/libzfs_mount.c' language='LANG_C99'>
     <array-type-def dimensions='1' type-id='6028cbfe' size-in-bits='256' id='b39b9aa7'>
       <subrange length='4' type-id='7359adad' id='16fe7105'/>
@@ -5682,15 +5660,6 @@
     </class-decl>
     <typedef-decl name='get_all_cb_t' type-id='803dac95' id='9b293607'/>
     <typedef-decl name='kcondvar_t' type-id='62fab762' id='29dbc0dd'/>
-    <class-decl name='kmutex' size-in-bits='384' is-struct='yes' visibility='default' id='f1cacfe1'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='m_lock' type-id='7a6844eb' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='m_owner' type-id='4051f5e7' visibility='default'/>
-      </data-member>
-    </class-decl>
-    <typedef-decl name='kmutex_t' type-id='f1cacfe1' id='b9eccc8f'/>
     <class-decl name='krwlock' size-in-bits='576' is-struct='yes' visibility='default' id='4361e3b2'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='rw_lock' type-id='3f680bc6' visibility='default'/>
@@ -6615,6 +6584,11 @@
     <pointer-type-def type-id='35acf840' size-in-bits='64' id='17f3480d'/>
     <pointer-type-def type-id='688c495b' size-in-bits='64' id='cec6f2e4'/>
     <pointer-type-def type-id='d11b7617' size-in-bits='64' id='23432aaa'/>
+    <function-decl name='dump_nvlist' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='5ce45b60'/>
+      <parameter type-id='95e97e5e'/>
+      <return type-id='48b5725f'/>
+    </function-decl>
     <function-decl name='zpool_get_handle' mangled-name='zpool_get_handle' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zpool_get_handle'>
       <parameter type-id='4c81de99'/>
       <return type-id='b0382bb3'/>
@@ -7468,7 +7442,7 @@
     <array-type-def dimensions='1' type-id='eaa32e2f' size-in-bits='256' id='209ef23f'>
       <subrange length='4' type-id='7359adad' id='16fe7105'/>
     </array-type-def>
-    <class-decl name='sendflags' size-in-bits='576' is-struct='yes' visibility='default' id='f6aa15be'>
+    <class-decl name='sendflags' size-in-bits='608' is-struct='yes' visibility='default' id='f6aa15be'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='verbosity' type-id='95e97e5e' visibility='default'/>
       </data-member>
@@ -7523,6 +7497,9 @@
       <data-member access='public' layout-offset-in-bits='544'>
         <var-decl name='saved' type-id='c19b74c3' visibility='default'/>
       </data-member>
+      <data-member access='public' layout-offset-in-bits='576'>
+        <var-decl name='no_preserve_encryption' type-id='c19b74c3' visibility='default'/>
+      </data-member>
     </class-decl>
     <typedef-decl name='sendflags_t' type-id='f6aa15be' id='945467e6'/>
     <typedef-decl name='snapfilter_cb_t' type-id='d2a5e211' id='3d3ffb69'/>
@@ -8204,6 +8181,13 @@
       <parameter type-id='5d6479ae'/>
       <return type-id='95e97e5e'/>
     </function-decl>
+    <function-decl name='lzc_send_progress' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='80f4b756'/>
+      <parameter type-id='95e97e5e'/>
+      <parameter type-id='5d6479ae'/>
+      <parameter type-id='5d6479ae'/>
+      <return type-id='95e97e5e'/>
+    </function-decl>
     <function-decl name='lzc_rename' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='80f4b756'/>
       <parameter type-id='80f4b756'/>
@@ -8619,26 +8603,6 @@
       </data-member>
     </class-decl>
     <typedef-decl name='zprop_desc_t' type-id='bbff5e4b' id='ffa52b96'/>
-    <class-decl name='extmnttab' size-in-bits='320' is-struct='yes' visibility='default' id='0c544dc0'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='mnt_special' type-id='26a90f95' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='mnt_mountp' type-id='26a90f95' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='mnt_fstype' type-id='26a90f95' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='mnt_mntopts' type-id='26a90f95' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='mnt_major' type-id='3502e3ff' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='mnt_minor' type-id='3502e3ff' visibility='default'/>
-      </data-member>
-    </class-decl>
     <pointer-type-def type-id='d5027220' size-in-bits='64' id='b7f2d5e6'/>
     <qualified-type-def type-id='26a90f95' const='yes' id='57de658a'/>
     <pointer-type-def type-id='57de658a' size-in-bits='64' id='f319fae0'/>
@@ -8648,7 +8612,6 @@
     <pointer-type-def type-id='a0de50cd' size-in-bits='64' id='24f95ba5'/>
     <qualified-type-def type-id='64636ce3' const='yes' id='072f7953'/>
     <pointer-type-def type-id='072f7953' size-in-bits='64' id='c8bc397b'/>
-    <pointer-type-def type-id='0c544dc0' size-in-bits='64' id='394fc496'/>
     <pointer-type-def type-id='aca3bac8' size-in-bits='64' id='d33f11cb'/>
     <qualified-type-def type-id='d33f11cb' restrict='yes' id='5c53ba29'/>
     <pointer-type-def type-id='ffa52b96' size-in-bits='64' id='76c8174b'/>
@@ -8744,7 +8707,7 @@
     </function-decl>
     <function-decl name='getextmntent' mangled-name='getextmntent' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getextmntent'>
       <parameter type-id='80f4b756'/>
-      <parameter type-id='394fc496'/>
+      <parameter type-id='9d424d31'/>
       <parameter type-id='62f7a03d'/>
       <return type-id='95e97e5e'/>
     </function-decl>
@@ -9638,6 +9601,9 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='lib/libzutil/zutil_import.c' language='LANG_C99'>
+    <array-type-def dimensions='1' type-id='a84c031d' size-in-bits='32' id='8e0573fd'>
+      <subrange length='4' type-id='7359adad' id='16fe7105'/>
+    </array-type-def>
     <class-decl name='importargs' size-in-bits='512' is-struct='yes' visibility='default' id='7ac83801'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='path' type-id='9b23c9ad' visibility='default'/>
@@ -9736,6 +9702,15 @@
         <var-decl name='__glibc_reserved' type-id='16dc656a' visibility='default'/>
       </data-member>
     </class-decl>
+    <union-decl name='pthread_mutexattr_t' size-in-bits='32' naming-typedef-id='8afd6070' visibility='default' id='7300eb00'>
+      <data-member access='public'>
+        <var-decl name='__size' type-id='8e0573fd' visibility='default'/>
+      </data-member>
+      <data-member access='public'>
+        <var-decl name='__align' type-id='95e97e5e' visibility='default'/>
+      </data-member>
+    </union-decl>
+    <typedef-decl name='pthread_mutexattr_t' type-id='7300eb00' id='8afd6070'/>
     <pointer-type-def type-id='e4957c49' size-in-bits='64' id='924bbc81'/>
     <qualified-type-def type-id='924bbc81' const='yes' id='5499dcde'/>
     <pointer-type-def type-id='5499dcde' size-in-bits='64' id='2236d41c'/>
@@ -9743,6 +9718,8 @@
     <pointer-type-def type-id='a3681dea' size-in-bits='64' id='fce6d540'/>
     <qualified-type-def type-id='e4957c49' const='yes' id='fced9da2'/>
     <pointer-type-def type-id='fced9da2' size-in-bits='64' id='b20efd18'/>
+    <qualified-type-def type-id='8afd6070' const='yes' id='1d853360'/>
+    <pointer-type-def type-id='1d853360' size-in-bits='64' id='c2afbd7e'/>
     <pointer-type-def type-id='7a842a6b' size-in-bits='64' id='07ee4a58'/>
     <pointer-type-def type-id='8a70a786' size-in-bits='64' id='5507783b'/>
     <pointer-type-def type-id='b1e62775' size-in-bits='64' id='f095e320'/>
@@ -9759,10 +9736,13 @@
     <function-decl name='spl_pagesize' mangled-name='spl_pagesize' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='spl_pagesize'>
       <return type-id='b59d7dce'/>
     </function-decl>
-    <function-decl name='posix_memalign' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='63e171df'/>
-      <parameter type-id='b59d7dce'/>
-      <parameter type-id='b59d7dce'/>
+    <function-decl name='pthread_mutex_init' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='18c91f9e'/>
+      <parameter type-id='c2afbd7e'/>
+      <return type-id='95e97e5e'/>
+    </function-decl>
+    <function-decl name='pthread_mutex_destroy' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='18c91f9e'/>
       <return type-id='95e97e5e'/>
     </function-decl>
     <function-decl name='sysconf' visibility='default' binding='global' size-in-bits='64'>
@@ -10699,4 +10679,238 @@
       <return type-id='24f95ba5'/>
     </function-decl>
   </abi-instr>
+  <abi-instr address-size='64' path='module/zfs/btree.c' language='LANG_C99'>
+    <typedef-decl name='kmem_cache_t' type-id='2a49bcee' id='5cd0fe54'/>
+    <typedef-decl name='umem_constructor_t' type-id='7e872986' id='da6072ac'/>
+    <typedef-decl name='umem_destructor_t' type-id='c039af2e' id='19c23f45'/>
+    <typedef-decl name='umem_reclaim_t' type-id='c5c76c9c' id='f1a257c7'/>
+    <class-decl name='umem_cache' size-in-bits='768' is-struct='yes' visibility='default' id='e066f130'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='cache_name' type-id='16dc656a' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='cache_bufsize' type-id='b59d7dce' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='cache_align' type-id='b59d7dce' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='cache_constructor' type-id='91f51f89' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='cache_destructor' type-id='9cb5182c' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <var-decl name='cache_reclaim' type-id='fbdc58f8' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='576'>
+        <var-decl name='cache_private' type-id='eaa32e2f' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='640'>
+        <var-decl name='cache_arena' type-id='eaa32e2f' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <var-decl name='cache_cflags' type-id='95e97e5e' visibility='default'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='umem_cache_t' type-id='e066f130' id='2a49bcee'/>
+    <pointer-type-def type-id='5cd0fe54' size-in-bits='64' id='23bd1729'/>
+    <pointer-type-def type-id='da6072ac' size-in-bits='64' id='91f51f89'/>
+    <pointer-type-def type-id='19c23f45' size-in-bits='64' id='9cb5182c'/>
+    <pointer-type-def type-id='f1a257c7' size-in-bits='64' id='fbdc58f8'/>
+    <var-decl name='zfs_btree_leaf_cache' type-id='23bd1729' visibility='default'/>
+    <function-decl name='posix_memalign' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='63e171df'/>
+      <parameter type-id='b59d7dce'/>
+      <parameter type-id='b59d7dce'/>
+      <return type-id='95e97e5e'/>
+    </function-decl>
+    <function-type size-in-bits='64' id='7e872986'>
+      <parameter type-id='eaa32e2f'/>
+      <parameter type-id='eaa32e2f'/>
+      <parameter type-id='95e97e5e'/>
+      <return type-id='95e97e5e'/>
+    </function-type>
+    <function-type size-in-bits='64' id='c039af2e'>
+      <parameter type-id='eaa32e2f'/>
+      <parameter type-id='eaa32e2f'/>
+      <return type-id='48b5725f'/>
+    </function-type>
+  </abi-instr>
+  <abi-instr address-size='64' path='module/zfs/range_tree.c' language='LANG_C99'>
+    <array-type-def dimensions='1' type-id='b96825af' size-in-bits='infinite' id='048fe7bc'>
+      <subrange length='infinite' type-id='7359adad' id='031f2035'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='4dc107b1' size-in-bits='8128' id='017d5779'>
+      <subrange length='127' type-id='7359adad' id='5ed08de5'/>
+    </array-type-def>
+    <class-decl name='zfs_btree_hdr' size-in-bits='128' is-struct='yes' visibility='default' id='fc907d62'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='bth_parent' type-id='0cafbda7' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='bth_first' type-id='8f92235e' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='96'>
+        <var-decl name='bth_count' type-id='8f92235e' visibility='default'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='zfs_btree_hdr_t' type-id='fc907d62' id='336228ae'/>
+    <class-decl name='zfs_btree_core' size-in-bits='8256' is-struct='yes' visibility='default' id='c2a40bdf'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='btc_hdr' type-id='336228ae' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='btc_children' type-id='017d5779' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='8256'>
+        <var-decl name='btc_elems' type-id='048fe7bc' visibility='default'/>
+      </data-member>
+    </class-decl>
+    <class-decl name='zfs_btree_leaf' size-in-bits='128' is-struct='yes' visibility='default' id='15b0aea0'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='btl_hdr' type-id='336228ae' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='btl_elems' type-id='048fe7bc' visibility='default'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='zfs_btree_leaf_t' type-id='15b0aea0' id='b685aaea'/>
+    <class-decl name='zfs_btree_index' size-in-bits='128' is-struct='yes' visibility='default' id='378b800c'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='bti_node' type-id='4dc107b1' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='bti_offset' type-id='8f92235e' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='96'>
+        <var-decl name='bti_before' type-id='c19b74c3' visibility='default'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='zfs_btree_index_t' type-id='378b800c' id='a481467c'/>
+    <typedef-decl name='zfs_btree_t' type-id='a0c8756d' id='aa8d6647'/>
+    <typedef-decl name='bt_find_in_buf_f' type-id='d12cb521' id='f3d91629'/>
+    <class-decl name='btree' size-in-bits='576' is-struct='yes' visibility='default' id='a0c8756d'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='bt_compar' type-id='585e1de9' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='bt_find_in_buf' type-id='f3d91629' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='bt_elem_size' type-id='b59d7dce' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='bt_leaf_size' type-id='b59d7dce' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='bt_leaf_cap' type-id='8f92235e' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='288'>
+        <var-decl name='bt_height' type-id='3ff5601b' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='bt_num_elems' type-id='9c313c2d' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='bt_num_nodes' type-id='9c313c2d' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <var-decl name='bt_root' type-id='4dc107b1' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <var-decl name='bt_bulk' type-id='a37f572b' visibility='default'/>
+      </data-member>
+    </class-decl>
+    <qualified-type-def type-id='a481467c' const='yes' id='2e014c8c'/>
+    <pointer-type-def type-id='2e014c8c' size-in-bits='64' id='120ba952'/>
+    <pointer-type-def type-id='2273bcd5' size-in-bits='64' id='d12cb521'/>
+    <pointer-type-def type-id='c2a40bdf' size-in-bits='64' id='0cafbda7'/>
+    <pointer-type-def type-id='336228ae' size-in-bits='64' id='4dc107b1'/>
+    <pointer-type-def type-id='a481467c' size-in-bits='64' id='b79742cf'/>
+    <pointer-type-def type-id='b79742cf' size-in-bits='64' id='e81e4e7f'/>
+    <pointer-type-def type-id='b685aaea' size-in-bits='64' id='a37f572b'/>
+    <pointer-type-def type-id='aa8d6647' size-in-bits='64' id='5c16a66a'/>
+    <function-decl name='zfs_btree_create' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='5c16a66a'/>
+      <parameter type-id='585e1de9'/>
+      <parameter type-id='f3d91629'/>
+      <parameter type-id='b59d7dce'/>
+      <return type-id='48b5725f'/>
+    </function-decl>
+    <function-decl name='zfs_btree_find' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='5c16a66a'/>
+      <parameter type-id='eaa32e2f'/>
+      <parameter type-id='b79742cf'/>
+      <return type-id='eaa32e2f'/>
+    </function-decl>
+    <function-decl name='zfs_btree_add_idx' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='5c16a66a'/>
+      <parameter type-id='eaa32e2f'/>
+      <parameter type-id='120ba952'/>
+      <return type-id='48b5725f'/>
+    </function-decl>
+    <function-decl name='zfs_btree_first' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='5c16a66a'/>
+      <parameter type-id='b79742cf'/>
+      <return type-id='eaa32e2f'/>
+    </function-decl>
+    <function-decl name='zfs_btree_last' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='5c16a66a'/>
+      <parameter type-id='b79742cf'/>
+      <return type-id='eaa32e2f'/>
+    </function-decl>
+    <function-decl name='zfs_btree_next' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='5c16a66a'/>
+      <parameter type-id='120ba952'/>
+      <parameter type-id='b79742cf'/>
+      <return type-id='eaa32e2f'/>
+    </function-decl>
+    <function-decl name='zfs_btree_prev' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='5c16a66a'/>
+      <parameter type-id='120ba952'/>
+      <parameter type-id='b79742cf'/>
+      <return type-id='eaa32e2f'/>
+    </function-decl>
+    <function-decl name='zfs_btree_add' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='5c16a66a'/>
+      <parameter type-id='eaa32e2f'/>
+      <return type-id='48b5725f'/>
+    </function-decl>
+    <function-decl name='zfs_btree_remove' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='5c16a66a'/>
+      <parameter type-id='eaa32e2f'/>
+      <return type-id='48b5725f'/>
+    </function-decl>
+    <function-decl name='zfs_btree_remove_idx' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='5c16a66a'/>
+      <parameter type-id='b79742cf'/>
+      <return type-id='48b5725f'/>
+    </function-decl>
+    <function-decl name='zfs_btree_numnodes' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='5c16a66a'/>
+      <return type-id='ee1f298e'/>
+    </function-decl>
+    <function-decl name='zfs_btree_destroy_nodes' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='5c16a66a'/>
+      <parameter type-id='e81e4e7f'/>
+      <return type-id='eaa32e2f'/>
+    </function-decl>
+    <function-decl name='zfs_btree_clear' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='5c16a66a'/>
+      <return type-id='48b5725f'/>
+    </function-decl>
+    <function-decl name='zfs_btree_destroy' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='5c16a66a'/>
+      <return type-id='48b5725f'/>
+    </function-decl>
+    <function-type size-in-bits='64' id='2273bcd5'>
+      <parameter type-id='5c16a66a'/>
+      <parameter type-id='ae3e8ca6'/>
+      <parameter type-id='8f92235e'/>
+      <parameter type-id='eaa32e2f'/>
+      <parameter type-id='b79742cf'/>
+      <return type-id='eaa32e2f'/>
+    </function-type>
+  </abi-instr>
 </abi-corpus>
diff --git a/lib/libzfs_core/libzfs_core.abi b/lib/libzfs_core/libzfs_core.abi
index 5c5d29243..4cd003a71 100644
--- a/lib/libzfs_core/libzfs_core.abi
+++ b/lib/libzfs_core/libzfs_core.abi
@@ -147,7 +147,6 @@
     <elf-symbol name='get_timestamp' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='getexecname' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='getextmntent' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='getmntany' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='getzoneid' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='kmem_asprintf' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='kmem_cache_reap_active' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -224,10 +223,10 @@
     <elf-symbol name='lzc_rollback_to' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='lzc_scrub' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='lzc_send' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='lzc_send_progress' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='lzc_send_redacted' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='lzc_send_resume' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='lzc_send_resume_redacted' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='lzc_send_progress' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='lzc_send_space' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='lzc_send_space_resume_redacted' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='lzc_send_wrapper' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -1489,7 +1488,7 @@
       <return type-id='7359adad'/>
     </function-decl>
   </abi-instr>
-  <abi-instr address-size='64' path='lib/libspl/os/linux/getmntany.c' language='LANG_C99'>
+  <abi-instr address-size='64' path='lib/libspl/os/linux/mnttab.c' language='LANG_C99'>
     <class-decl name='mnttab' size-in-bits='256' is-struct='yes' visibility='default' id='1b055409'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='mnt_special' type-id='26a90f95' visibility='default'/>
@@ -1504,26 +1503,6 @@
         <var-decl name='mnt_mntopts' type-id='26a90f95' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='extmnttab' size-in-bits='320' is-struct='yes' visibility='default' id='0c544dc0'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='mnt_special' type-id='26a90f95' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='mnt_mountp' type-id='26a90f95' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='mnt_fstype' type-id='26a90f95' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='mnt_mntopts' type-id='26a90f95' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='mnt_major' type-id='3502e3ff' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='mnt_minor' type-id='3502e3ff' visibility='default'/>
-      </data-member>
-    </class-decl>
     <class-decl name='mntent' size-in-bits='320' is-struct='yes' visibility='default' id='56fe4a37'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='mnt_fsname' type-id='26a90f95' visibility='default'/>
@@ -1593,7 +1572,6 @@
     </class-decl>
     <typedef-decl name='__ino64_t' type-id='7359adad' id='71288a47'/>
     <typedef-decl name='__blkcnt64_t' type-id='bd54fe1a' id='4e711bf1'/>
-    <pointer-type-def type-id='0c544dc0' size-in-bits='64' id='394fc496'/>
     <pointer-type-def type-id='56fe4a37' size-in-bits='64' id='b6b61d2f'/>
     <qualified-type-def type-id='b6b61d2f' restrict='yes' id='3cad23cd'/>
     <pointer-type-def type-id='1b055409' size-in-bits='64' id='9d424d31'/>
@@ -1619,12 +1597,6 @@
       <parameter type-id='f1cadedf'/>
       <return type-id='95e97e5e'/>
     </function-decl>
-    <function-decl name='getmntany' mangled-name='getmntany' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getmntany'>
-      <parameter type-id='822cd80b' name='fp'/>
-      <parameter type-id='9d424d31' name='mgetp'/>
-      <parameter type-id='9d424d31' name='mrefp'/>
-      <return type-id='95e97e5e'/>
-    </function-decl>
     <function-decl name='_sol_getmntent' mangled-name='_sol_getmntent' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_sol_getmntent'>
       <parameter type-id='822cd80b' name='fp'/>
       <parameter type-id='9d424d31' name='mgetp'/>
@@ -1632,7 +1604,7 @@
     </function-decl>
     <function-decl name='getextmntent' mangled-name='getextmntent' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getextmntent'>
       <parameter type-id='80f4b756' name='path'/>
-      <parameter type-id='394fc496' name='entry'/>
+      <parameter type-id='9d424d31' name='entry'/>
       <parameter type-id='62f7a03d' name='statbuf'/>
       <return type-id='95e97e5e'/>
     </function-decl>
@@ -3998,13 +3970,6 @@
       <parameter type-id='5d6479ae' name='spacep'/>
       <return type-id='95e97e5e'/>
     </function-decl>
-    <function-decl name='lzc_send_progress' mangled-name='lzc_send_progress' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_send_progress'>
-      <parameter type-id='80f4b756' name='snapname'/>
-      <parameter type-id='95e97e5e' name='fd'/>
-      <parameter type-id='5d6479ae' name='bytes_written'/>
-      <parameter type-id='5d6479ae' name='blocks_visited'/>
-      <return type-id='95e97e5e'/>
-    </function-decl>
     <function-decl name='lzc_send_space' mangled-name='lzc_send_space' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_send_space'>
       <parameter type-id='80f4b756' name='snapname'/>
       <parameter type-id='80f4b756' name='from'/>
@@ -4012,6 +3977,13 @@
       <parameter type-id='5d6479ae' name='spacep'/>
       <return type-id='95e97e5e'/>
     </function-decl>
+    <function-decl name='lzc_send_progress' mangled-name='lzc_send_progress' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_send_progress'>
+      <parameter type-id='80f4b756' name='snapname'/>
+      <parameter type-id='95e97e5e' name='fd'/>
+      <parameter type-id='5d6479ae' name='bytes_written'/>
+      <parameter type-id='5d6479ae' name='blocks_visited'/>
+      <return type-id='95e97e5e'/>
+    </function-decl>
     <function-decl name='lzc_receive' mangled-name='lzc_receive' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lzc_receive'>
       <parameter type-id='80f4b756' name='snapname'/>
       <parameter type-id='5ce45b60' name='props'/>