Skip to content

Commit 323d304

Browse files
committed
Update ABI files after lockless zpool status change
Signed-off-by: Tony Hutter <[email protected]>
1 parent 3067566 commit 323d304

File tree

1 file changed

+37
-19
lines changed

1 file changed

+37
-19
lines changed

lib/libzfs/libzfs.abi

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@
218218
<elf-symbol name='libzfs_run_process' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
219219
<elf-symbol name='libzfs_run_process_get_stdout' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
220220
<elf-symbol name='libzfs_run_process_get_stdout_nopath' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
221+
<elf-symbol name='libzfs_set_lock_behavior' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
221222
<elf-symbol name='list_create' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
222223
<elf-symbol name='list_destroy' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
223224
<elf-symbol name='list_head' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -2073,6 +2074,15 @@
20732074
<enumerator name='ZPROP_SRC_RECEIVED' value='32'/>
20742075
</enum-decl>
20752076
<typedef-decl name='zprop_source_t' type-id='5903f80e' id='a2256d42'/>
2077+
<enum-decl name='zpool_lock_behavior_t' naming-typedef-id='8b691302' id='cdf5aa2e'>
2078+
<underlying-type type-id='9cac1fee'/>
2079+
<enumerator name='ZPOOL_LOCK_BEHAVIOR_WAIT' value='0'/>
2080+
<enumerator name='ZPOOL_LOCK_BEHAVIOR_DEFAULT' value='0'/>
2081+
<enumerator name='ZPOOL_LOCK_BEHAVIOR_TRYLOCK' value='1'/>
2082+
<enumerator name='ZPOOL_LOCK_BEHAVIOR_LOCKLESS' value='2'/>
2083+
<enumerator name='ZPOOL_LOCK_BEHAVIOR_END' value='3'/>
2084+
</enum-decl>
2085+
<typedef-decl name='zpool_lock_behavior_t' type-id='cdf5aa2e' id='8b691302'/>
20762086
<class-decl name='nvlist' size-in-bits='192' is-struct='yes' visibility='default' id='ac266fd9'>
20772087
<data-member access='public' layout-offset-in-bits='0'>
20782088
<var-decl name='nvl_version' type-id='3ff5601b' visibility='default'/>
@@ -2212,7 +2222,7 @@
22122222
<typedef-decl name='__uint32_t' type-id='f0981eeb' id='62f1140c'/>
22132223
<typedef-decl name='__uint64_t' type-id='7359adad' id='8910171f'/>
22142224
<typedef-decl name='size_t' type-id='7359adad' id='b59d7dce'/>
2215-
<class-decl name='libzfs_handle' size-in-bits='18240' is-struct='yes' visibility='default' id='c8a9d9d8'>
2225+
<class-decl name='libzfs_handle' size-in-bits='18304' is-struct='yes' visibility='default' id='c8a9d9d8'>
22162226
<data-member access='public' layout-offset-in-bits='0'>
22172227
<var-decl name='libzfs_error' type-id='95e97e5e' visibility='default'/>
22182228
</data-member>
@@ -2270,6 +2280,9 @@
22702280
<data-member access='public' layout-offset-in-bits='18176'>
22712281
<var-decl name='libfetch_load_error' type-id='26a90f95' visibility='default'/>
22722282
</data-member>
2283+
<data-member access='public' layout-offset-in-bits='18240'>
2284+
<var-decl name='zpool_lock_behavior' type-id='8b691302' visibility='default'/>
2285+
</data-member>
22732286
</class-decl>
22742287
<class-decl name='zfs_handle' size-in-bits='4928' is-struct='yes' visibility='default' id='f6ee4445'>
22752288
<data-member access='public' layout-offset-in-bits='0'>
@@ -2949,6 +2962,12 @@
29492962
<parameter type-id='b65f7fd1'/>
29502963
<return type-id='95e97e5e'/>
29512964
</function-decl>
2965+
<function-decl name='nvlist_alloc' visibility='default' binding='global' size-in-bits='64'>
2966+
<parameter type-id='857bb57e'/>
2967+
<parameter type-id='3502e3ff'/>
2968+
<parameter type-id='95e97e5e'/>
2969+
<return type-id='95e97e5e'/>
2970+
</function-decl>
29522971
<function-decl name='nvlist_free' visibility='default' binding='global' size-in-bits='64'>
29532972
<parameter type-id='5ce45b60'/>
29542973
<return type-id='48b5725f'/>
@@ -2959,6 +2978,12 @@
29592978
<parameter type-id='95e97e5e'/>
29602979
<return type-id='95e97e5e'/>
29612980
</function-decl>
2981+
<function-decl name='nvlist_add_uint64' visibility='default' binding='global' size-in-bits='64'>
2982+
<parameter type-id='5ce45b60'/>
2983+
<parameter type-id='80f4b756'/>
2984+
<parameter type-id='9c313c2d'/>
2985+
<return type-id='95e97e5e'/>
2986+
</function-decl>
29622987
<function-decl name='nvlist_lookup_nvlist' visibility='default' binding='global' size-in-bits='64'>
29632988
<parameter type-id='5ce45b60'/>
29642989
<parameter type-id='80f4b756'/>
@@ -3054,6 +3079,12 @@
30543079
<parameter type-id='b59d7dce'/>
30553080
<return type-id='48b5725f'/>
30563081
</function-decl>
3082+
<function-decl name='zcmd_write_src_nvlist' visibility='default' binding='global' size-in-bits='64'>
3083+
<parameter type-id='b0382bb3'/>
3084+
<parameter type-id='e4ec4540'/>
3085+
<parameter type-id='5ce45b60'/>
3086+
<return type-id='48b5725f'/>
3087+
</function-decl>
30573088
<function-decl name='zcmd_expand_dst_nvlist' visibility='default' binding='global' size-in-bits='64'>
30583089
<parameter type-id='b0382bb3'/>
30593090
<parameter type-id='e4ec4540'/>
@@ -3563,12 +3594,6 @@
35633594
<parameter type-id='80f4b756'/>
35643595
<return type-id='58603c44'/>
35653596
</function-decl>
3566-
<function-decl name='nvlist_add_uint64' visibility='default' binding='global' size-in-bits='64'>
3567-
<parameter type-id='5ce45b60'/>
3568-
<parameter type-id='80f4b756'/>
3569-
<parameter type-id='9c313c2d'/>
3570-
<return type-id='95e97e5e'/>
3571-
</function-decl>
35723597
<function-decl name='nvlist_add_string' visibility='default' binding='global' size-in-bits='64'>
35733598
<parameter type-id='5ce45b60'/>
35743599
<parameter type-id='80f4b756'/>
@@ -4324,12 +4349,6 @@
43244349
<parameter type-id='c19b74c3'/>
43254350
<return type-id='c19b74c3'/>
43264351
</function-decl>
4327-
<function-decl name='nvlist_alloc' visibility='default' binding='global' size-in-bits='64'>
4328-
<parameter type-id='857bb57e'/>
4329-
<parameter type-id='3502e3ff'/>
4330-
<parameter type-id='95e97e5e'/>
4331-
<return type-id='95e97e5e'/>
4332-
</function-decl>
43334352
<function-decl name='nvlist_size' visibility='default' binding='global' size-in-bits='64'>
43344353
<parameter type-id='5ce45b60'/>
43354354
<parameter type-id='78c01427'/>
@@ -4948,12 +4967,6 @@
49484967
<parameter type-id='2e45de5d'/>
49494968
<return type-id='95e97e5e'/>
49504969
</function-decl>
4951-
<function-decl name='zcmd_write_src_nvlist' visibility='default' binding='global' size-in-bits='64'>
4952-
<parameter type-id='b0382bb3'/>
4953-
<parameter type-id='e4ec4540'/>
4954-
<parameter type-id='5ce45b60'/>
4955-
<return type-id='48b5725f'/>
4956-
</function-decl>
49574970
<function-decl name='changelist_prefix' visibility='default' binding='global' size-in-bits='64'>
49584971
<parameter type-id='0d41d328'/>
49594972
<return type-id='95e97e5e'/>
@@ -8550,6 +8563,11 @@
85508563
<parameter type-id='7292109c' name='lines_cnt'/>
85518564
<return type-id='95e97e5e'/>
85528565
</function-decl>
8566+
<function-decl name='libzfs_set_lock_behavior' mangled-name='libzfs_set_lock_behavior' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='libzfs_set_lock_behavior'>
8567+
<parameter type-id='b0382bb3' name='hdl'/>
8568+
<parameter type-id='8b691302' name='zpool_lock_behavior'/>
8569+
<return type-id='48b5725f'/>
8570+
</function-decl>
85538571
</abi-instr>
85548572
<abi-instr address-size='64' path='lib/libzfs/os/linux/libzfs_mount_os.c' language='LANG_C99'>
85558573
<pointer-type-def type-id='7359adad' size-in-bits='64' id='1d2c2b85'/>

0 commit comments

Comments
 (0)