src - FreeBSD source tree

diff options


context:
space:
mode:

author	Paul Dagnelie <paulcd2000@gmail.com>	2021-12-07 01:19:13 +0000
committer	GitHub <noreply@github.com>	2021-12-07 01:19:13 +0000
commit	795075e63803db70793079c2176dc419df3788c5 (patch)
tree	bdec35b2b73d946efca2537691b114604f112ab8
parent	14ba514af6110bcc3772db7c7cde787861588316 (diff)
download	src-795075e63803db70793079c2176dc419df3788c5.tar.gz src-795075e63803db70793079c2176dc419df3788c5.zip

Diffstat

-rw-r--r--

cmd/zed/agents/fmd_api.c

-rw-r--r--

cmd/zed/agents/zfs_mod.c

-rw-r--r--

cmd/zed/agents/zfs_retire.c

-rw-r--r--

cmd/zfs/zfs_main.c

-rw-r--r--

cmd/zpool/zpool_vdev.c

-rw-r--r--

cmd/ztest/ztest.c

-rw-r--r--

contrib/pyzfs/libzfs_core/bindings/libnvpair.py

-rw-r--r--

include/sys/nvpair.h

197

-rw-r--r--

include/sys/nvpair_impl.h

-rw-r--r--

lib/libnvpair/libnvpair.abi

267

-rw-r--r--

lib/libuutil/libuutil.abi

155

-rw-r--r--

lib/libzfs/libzfs.abi

171

-rw-r--r--

lib/libzfs/libzfs_pool.c

-rw-r--r--

lib/libzfs_core/libzfs_core.abi

137

-rw-r--r--

lib/libzfsbootenv/libzfsbootenv.abi

-rw-r--r--

lib/libzfsbootenv/lzbe_pair.c

-rw-r--r--

lib/libzutil/zutil_import.c

-rw-r--r--

module/nvpair/fnvpair.c

-rw-r--r--

module/nvpair/nvpair.c

144

-rw-r--r--

module/os/freebsd/zfs/spa_os.c

-rw-r--r--

module/zfs/fm.c

-rw-r--r--

module/zfs/spa.c

-rw-r--r--

module/zfs/vdev_draid.c

-rw-r--r--

module/zfs/vdev_label.c

-rw-r--r--

module/zfs/vdev_removal.c

-rw-r--r--

module/zfs/zfs_fuid.c

-rw-r--r--

tests/zfs-tests/cmd/libzfs_input_check/libzfs_input_check.c

-rw-r--r--

tests/zfs-tests/cmd/nvlist_to_lua/nvlist_to_lua.c

28 files changed, 728 insertions, 621 deletions

diff --git a/cmd/zed/agents/fmd_api.c b/cmd/zed/agents/fmd_api.c
index 607b387ca3a8..c9231fba2aee 100644
--- a/cmd/zed/agents/fmd_api.c
+++ b/cmd/zed/agents/fmd_api.c

@@ -428,7 +428,8 @@ fmd_case_add_suspect(fmd_hdl_t *hdl, fmd_case_t *cp, nvlist_t *fault)

err |= nvlist_add_string(nvl, FM_SUSPECT_DIAG_CODE, code);

err |= nvlist_add_int64_array(nvl, FM_SUSPECT_DIAG_TIME, tod, 2);

err |= nvlist_add_uint32(nvl, FM_SUSPECT_FAULT_SZ, 1);

- err |= nvlist_add_nvlist_array(nvl, FM_SUSPECT_FAULT_LIST, &fault, 1);

+ err |= nvlist_add_nvlist_array(nvl, FM_SUSPECT_FAULT_LIST,

+ (const nvlist_t **)&fault, 1);

if (err)

zed_log_die("failed to populate nvlist");

diff --git a/cmd/zed/agents/zfs_mod.c b/cmd/zed/agents/zfs_mod.c
index 3bcdf6e1d718..b496b29ac136 100644
--- a/cmd/zed/agents/zfs_mod.c
+++ b/cmd/zed/agents/zfs_mod.c

@@ -414,8 +414,8 @@ zfs_process_add(zpool_handle_t *zhp, nvlist_t *vdev, boolean_t labeled)

ZPOOL_CONFIG_VDEV_ENC_SYSFS_PATH, enc_sysfs_path) != 0) ||

nvlist_add_uint64(newvd, ZPOOL_CONFIG_WHOLE_DISK, wholedisk) != 0 ||

nvlist_add_string(nvroot, ZPOOL_CONFIG_TYPE, VDEV_TYPE_ROOT) != 0 ||

- nvlist_add_nvlist_array(nvroot, ZPOOL_CONFIG_CHILDREN, &newvd,

- 1) != 0) {

+ nvlist_add_nvlist_array(nvroot, ZPOOL_CONFIG_CHILDREN,

+ (const nvlist_t **)&newvd, 1) != 0) {

zed_log_msg(LOG_WARNING, "zfs_mod: unable to add nvlist pairs");

nvlist_free(newvd);

nvlist_free(nvroot);

diff --git a/cmd/zed/agents/zfs_retire.c b/cmd/zed/agents/zfs_retire.c
index 6c009bdc1235..5fb7b4e84c5e 100644
--- a/cmd/zed/agents/zfs_retire.c
+++ b/cmd/zed/agents/zfs_retire.c

@@ -239,7 +239,7 @@ replace_with_spare(fmd_hdl_t *hdl, zpool_handle_t *zhp, nvlist_t *vdev)

ZPOOL_CONFIG_ASHIFT, ashift);

(void) nvlist_add_nvlist_array(replacement,

- ZPOOL_CONFIG_CHILDREN, &spares[s], 1);

+ ZPOOL_CONFIG_CHILDREN, (const nvlist_t **)&spares[s], 1);

fmd_hdl_debug(hdl, "zpool_vdev_replace '%s' with spare '%s'",

dev_name, zfs_basename(spare_name));

diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c
index d05cb29c69d6..c43951d82897 100644
--- a/cmd/zfs/zfs_main.c
+++ b/cmd/zfs/zfs_main.c

@@ -8010,7 +8010,8 @@ zfs_do_channel_program(int argc, char **argv)

* }

nvlist_t *argnvl = fnvlist_alloc();

- fnvlist_add_string_array(argnvl, ZCP_ARG_CLIARGV, argv + 2, argc - 2);

+ fnvlist_add_string_array(argnvl, ZCP_ARG_CLIARGV,

+ (const char **)argv + 2, argc - 2);

if (sync_flag) {

ret = lzc_channel_program(poolname, progbuf,

diff --git a/cmd/zpool/zpool_vdev.c b/cmd/zpool/zpool_vdev.c
index dcc67e7e2014..0653a09faea2 100644
--- a/cmd/zpool/zpool_vdev.c
+++ b/cmd/zpool/zpool_vdev.c

@@ -1647,8 +1647,8 @@ construct_spec(nvlist_t *props, int argc, char **argv)

}

verify(nvlist_add_nvlist_array(nv,

- ZPOOL_CONFIG_CHILDREN, child,

- children) == 0);

+ ZPOOL_CONFIG_CHILDREN,

+ (const nvlist_t **)child, children) == 0);

for (c = 0; c < children; c++)

nvlist_free(child[c]);

@@ -1713,13 +1713,13 @@ construct_spec(nvlist_t *props, int argc, char **argv)

verify(nvlist_add_string(nvroot, ZPOOL_CONFIG_TYPE,

VDEV_TYPE_ROOT) == 0);

verify(nvlist_add_nvlist_array(nvroot, ZPOOL_CONFIG_CHILDREN,

- top, toplevels) == 0);

+ (const nvlist_t **)top, toplevels) == 0);

if (nspares != 0)

verify(nvlist_add_nvlist_array(nvroot, ZPOOL_CONFIG_SPARES,

- spares, nspares) == 0);

+ (const nvlist_t **)spares, nspares) == 0);

if (nl2cache != 0)

verify(nvlist_add_nvlist_array(nvroot, ZPOOL_CONFIG_L2CACHE,

- l2cache, nl2cache) == 0);

+ (const nvlist_t **)l2cache, nl2cache) == 0);

spec_out:

for (t = 0; t < toplevels; t++)

diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c
index 5a5c381409a2..a2568962d877 100644
--- a/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c

@@ -1287,7 +1287,8 @@ make_vdev_raid(char *path, char *aux, char *pool, size_t size,

ztest_opts.zo_raid_type);

fnvlist_add_uint64(raid, ZPOOL_CONFIG_NPARITY,

ztest_opts.zo_raid_parity);

- fnvlist_add_nvlist_array(raid, ZPOOL_CONFIG_CHILDREN, child, r);

+ fnvlist_add_nvlist_array(raid, ZPOOL_CONFIG_CHILDREN,

+ (const nvlist_t **)child, r);

if (strcmp(ztest_opts.zo_raid_type, VDEV_TYPE_DRAID) == 0) {

uint64_t ndata = ztest_opts.zo_draid_data;

@@ -1335,7 +1336,8 @@ make_vdev_mirror(char *path, char *aux, char *pool, size_t size,

mirror = fnvlist_alloc();

fnvlist_add_string(mirror, ZPOOL_CONFIG_TYPE, VDEV_TYPE_MIRROR);

- fnvlist_add_nvlist_array(mirror, ZPOOL_CONFIG_CHILDREN, child, m);

+ fnvlist_add_nvlist_array(mirror, ZPOOL_CONFIG_CHILDREN,

+ (const nvlist_t **)child, m);

for (c = 0; c < m; c++)

fnvlist_free(child[c]);

@@ -1374,7 +1376,7 @@ make_vdev_root(char *path, char *aux, char *pool, size_t size, uint64_t ashift,

root = fnvlist_alloc();

fnvlist_add_string(root, ZPOOL_CONFIG_TYPE, VDEV_TYPE_ROOT);

fnvlist_add_nvlist_array(root, aux ? aux : ZPOOL_CONFIG_CHILDREN,

- child, t);

+ (const nvlist_t **)child, t);

for (c = 0; c < t; c++)

fnvlist_free(child[c]);

@@ -3550,8 +3552,8 @@ ztest_split_pool(ztest_ds_t *zd, uint64_t id)

/* OK, create a config that can be used to split */

split = fnvlist_alloc();

fnvlist_add_string(split, ZPOOL_CONFIG_TYPE, VDEV_TYPE_ROOT);

- fnvlist_add_nvlist_array(split, ZPOOL_CONFIG_CHILDREN, schild,

- lastlogid != 0 ? lastlogid : schildren);

+ fnvlist_add_nvlist_array(split, ZPOOL_CONFIG_CHILDREN,

+ (const nvlist_t **)schild, lastlogid != 0 ? lastlogid : schildren);

config = fnvlist_alloc();

fnvlist_add_nvlist(config, ZPOOL_CONFIG_VDEV_TREE, split);

diff --git a/contrib/pyzfs/libzfs_core/bindings/libnvpair.py b/contrib/pyzfs/libzfs_core/bindings/libnvpair.py
index 3cd72d4908de..54a805907237 100644
--- a/contrib/pyzfs/libzfs_core/bindings/libnvpair.py
+++ b/contrib/pyzfs/libzfs_core/bindings/libnvpair.py

@@ -79,20 +79,30 @@ CDEF = """

int nvlist_add_uint64(nvlist_t *, const char *, uint64_t);

int nvlist_add_string(nvlist_t *, const char *, const char *);

int nvlist_add_nvlist(nvlist_t *, const char *, nvlist_t *);

- int nvlist_add_boolean_array(nvlist_t *, const char *, boolean_t *,

- uint_t);

- int nvlist_add_byte_array(nvlist_t *, const char *, uchar_t *, uint_t);

- int nvlist_add_int8_array(nvlist_t *, const char *, int8_t *, uint_t);

- int nvlist_add_uint8_array(nvlist_t *, const char *, uint8_t *, uint_t);

- int nvlist_add_int16_array(nvlist_t *, const char *, int16_t *, uint_t);

- int nvlist_add_uint16_array(nvlist_t *, const char *, uint16_t *, uint_t);

- int nvlist_add_int32_array(nvlist_t *, const char *, int32_t *, uint_t);

- int nvlist_add_uint32_array(nvlist_t *, const char *, uint32_t *, uint_t);

- int nvlist_add_int64_array(nvlist_t *, const char *, int64_t *, uint_t);

- int nvlist_add_uint64_array(nvlist_t *, const char *, uint64_t *, uint_t);

- int nvlist_add_string_array(nvlist_t *, const char *, char *const *,

- uint_t);

- int nvlist_add_nvlist_array(nvlist_t *, const char *, nvlist_t **, uint_t);

+ int nvlist_add_boolean_array(nvlist_t *, const char *,

+ const boolean_t *, uint_t);

+ int nvlist_add_byte_array(nvlist_t *, const char *,

+ const uchar_t *, uint_t);

+ int nvlist_add_int8_array(nvlist_t *, const char *,

+ const int8_t *, uint_t);

+ int nvlist_add_uint8_array(nvlist_t *, const char *,

+ const uint8_t *, uint_t);

+ int nvlist_add_int16_array(nvlist_t *, const char *,

+ const int16_t *, uint_t);

+ int nvlist_add_uint16_array(nvlist_t *, const char *,

+ const uint16_t *, uint_t);

+ int nvlist_add_int32_array(nvlist_t *, const char *,

+ const int32_t *, uint_t);

+ int nvlist_add_uint32_array(nvlist_t *, const char *,

+ const uint32_t *, uint_t);

+ int nvlist_add_int64_array(nvlist_t *, const char *,

+ const int64_t *, uint_t);

+ int nvlist_add_uint64_array(nvlist_t *, const char *,

+ const uint64_t *, uint_t);

+ int nvlist_add_string_array(nvlist_t *, const char *,

+ const char * const *, uint_t);

+ int nvlist_add_nvlist_array(nvlist_t *, const char *,

+ const nvlist_t * const *, uint_t);

nvpair_t *nvlist_next_nvpair(nvlist_t *, nvpair_t *);

nvpair_t *nvlist_prev_nvpair(nvlist_t *, nvpair_t *);

diff --git a/include/sys/nvpair.h b/include/sys/nvpair.h
index 76d383a3c681..340b0d79c0a2 100644
--- a/include/sys/nvpair.h
+++ b/include/sys/nvpair.h

@@ -154,7 +154,7 @@ _SYS_NVPAIR_H void nvlist_free(nvlist_t *);

_SYS_NVPAIR_H int nvlist_size(nvlist_t *, size_t *, int);

_SYS_NVPAIR_H int nvlist_pack(nvlist_t *, char **, size_t *, int, int);

_SYS_NVPAIR_H int nvlist_unpack(char *, size_t, nvlist_t **, int);

-_SYS_NVPAIR_H int nvlist_dup(nvlist_t *, nvlist_t **, int);

+_SYS_NVPAIR_H int nvlist_dup(const nvlist_t *, nvlist_t **, int);

_SYS_NVPAIR_H int nvlist_merge(nvlist_t *, nvlist_t *, int);

_SYS_NVPAIR_H uint_t nvlist_nvflag(nvlist_t *);

@@ -163,7 +163,7 @@ _SYS_NVPAIR_H int nvlist_xalloc(nvlist_t **, uint_t, nv_alloc_t *);

_SYS_NVPAIR_H int nvlist_xpack(nvlist_t *, char **, size_t *, int,

nv_alloc_t *);

_SYS_NVPAIR_H int nvlist_xunpack(char *, size_t, nvlist_t **, nv_alloc_t *);

-_SYS_NVPAIR_H int nvlist_xdup(nvlist_t *, nvlist_t **, nv_alloc_t *);

+_SYS_NVPAIR_H int nvlist_xdup(const nvlist_t *, nvlist_t **, nv_alloc_t *);

_SYS_NVPAIR_H nv_alloc_t *nvlist_lookup_nv_alloc(nvlist_t *);

_SYS_NVPAIR_H int nvlist_add_nvpair(nvlist_t *, nvpair_t *);

@@ -179,31 +179,31 @@ _SYS_NVPAIR_H int nvlist_add_uint32(nvlist_t *, const char *, uint32_t);

_SYS_NVPAIR_H int nvlist_add_int64(nvlist_t *, const char *, int64_t);

_SYS_NVPAIR_H int nvlist_add_uint64(nvlist_t *, const char *, uint64_t);

_SYS_NVPAIR_H int nvlist_add_string(nvlist_t *, const char *, const char *);

-_SYS_NVPAIR_H int nvlist_add_nvlist(nvlist_t *, const char *, nvlist_t *);

+_SYS_NVPAIR_H int nvlist_add_nvlist(nvlist_t *, const char *, const nvlist_t *);

_SYS_NVPAIR_H int nvlist_add_boolean_array(nvlist_t *, const char *,

- boolean_t *, uint_t);

-_SYS_NVPAIR_H int nvlist_add_byte_array(nvlist_t *, const char *, uchar_t *,

- uint_t);

-_SYS_NVPAIR_H int nvlist_add_int8_array(nvlist_t *, const char *, int8_t *,

- uint_t);

-_SYS_NVPAIR_H int nvlist_add_uint8_array(nvlist_t *, const char *, uint8_t *,

- uint_t);

-_SYS_NVPAIR_H int nvlist_add_int16_array(nvlist_t *, const char *, int16_t *,

- uint_t);

-_SYS_NVPAIR_H int nvlist_add_uint16_array(nvlist_t *, const char *, uint16_t *,

- uint_t);

-_SYS_NVPAIR_H int nvlist_add_int32_array(nvlist_t *, const char *, int32_t *,

- uint_t);

-_SYS_NVPAIR_H int nvlist_add_uint32_array(nvlist_t *, const char *, uint32_t *,

- uint_t);

-_SYS_NVPAIR_H int nvlist_add_int64_array(nvlist_t *, const char *, int64_t *,

- uint_t);

-_SYS_NVPAIR_H int nvlist_add_uint64_array(nvlist_t *, const char *, uint64_t *,

- uint_t);

+ const boolean_t *, uint_t);

+_SYS_NVPAIR_H int nvlist_add_byte_array(nvlist_t *, const char *,

+ const uchar_t *, uint_t);

+_SYS_NVPAIR_H int nvlist_add_int8_array(nvlist_t *, const char *,

+ const int8_t *, uint_t);

+_SYS_NVPAIR_H int nvlist_add_uint8_array(nvlist_t *, const char *,

+ const uint8_t *, uint_t);

+_SYS_NVPAIR_H int nvlist_add_int16_array(nvlist_t *, const char *,

+ const int16_t *, uint_t);

+_SYS_NVPAIR_H int nvlist_add_uint16_array(nvlist_t *, const char *,

+ const uint16_t *, uint_t);

+_SYS_NVPAIR_H int nvlist_add_int32_array(nvlist_t *, const char *,

+ const int32_t *, uint_t);

+_SYS_NVPAIR_H int nvlist_add_uint32_array(nvlist_t *, const char *,

+ const uint32_t *, uint_t);

+_SYS_NVPAIR_H int nvlist_add_int64_array(nvlist_t *, const char *,

+ const int64_t *, uint_t);

+_SYS_NVPAIR_H int nvlist_add_uint64_array(nvlist_t *, const char *,

+ const uint64_t *, uint_t);

_SYS_NVPAIR_H int nvlist_add_string_array(nvlist_t *, const char *,

- char * const *, uint_t);

+ const char * const *, uint_t);

_SYS_NVPAIR_H int nvlist_add_nvlist_array(nvlist_t *, const char *,

- nvlist_t **, uint_t);

+ const nvlist_t * const *, uint_t);

_SYS_NVPAIR_H int nvlist_add_hrtime(nvlist_t *, const char *, hrtime_t);

#if !defined(_KERNEL) && !defined(_STANDALONE)

_SYS_NVPAIR_H int nvlist_add_double(nvlist_t *, const char *, double);

@@ -213,18 +213,25 @@ _SYS_NVPAIR_H int nvlist_remove(nvlist_t *, const char *, data_type_t);

_SYS_NVPAIR_H int nvlist_remove_all(nvlist_t *, const char *);

_SYS_NVPAIR_H int nvlist_remove_nvpair(nvlist_t *, nvpair_t *);

-_SYS_NVPAIR_H int nvlist_lookup_boolean(nvlist_t *, const char *);

-_SYS_NVPAIR_H int nvlist_lookup_boolean_value(nvlist_t *, const char *,

+_SYS_NVPAIR_H int nvlist_lookup_boolean(const nvlist_t *, const char *);

+_SYS_NVPAIR_H int nvlist_lookup_boolean_value(const nvlist_t *, const char *,

boolean_t *);

-_SYS_NVPAIR_H int nvlist_lookup_byte(nvlist_t *, const char *, uchar_t *);

-_SYS_NVPAIR_H int nvlist_lookup_int8(nvlist_t *, const char *, int8_t *);

-_SYS_NVPAIR_H int nvlist_lookup_uint8(nvlist_t *, const char *, uint8_t *);

-_SYS_NVPAIR_H int nvlist_lookup_int16(nvlist_t *, const char *, int16_t *);

-_SYS_NVPAIR_H int nvlist_lookup_uint16(nvlist_t *, const char *, uint16_t *);

-_SYS_NVPAIR_H int nvlist_lookup_int32(nvlist_t *, const char *, int32_t *);

-_SYS_NVPAIR_H int nvlist_lookup_uint32(nvlist_t *, const char *, uint32_t *);

-_SYS_NVPAIR_H int nvlist_lookup_int64(nvlist_t *, const char *, int64_t *);

-_SYS_NVPAIR_H int nvlist_lookup_uint64(nvlist_t *, const char *, uint64_t *);

+_SYS_NVPAIR_H int nvlist_lookup_byte(const nvlist_t *, const char *, uchar_t *);

+_SYS_NVPAIR_H int nvlist_lookup_int8(const nvlist_t *, const char *, int8_t *);

+_SYS_NVPAIR_H int nvlist_lookup_uint8(const nvlist_t *, const char *,

+ uint8_t *);

+_SYS_NVPAIR_H int nvlist_lookup_int16(const nvlist_t *, const char *,

+ int16_t *);

+_SYS_NVPAIR_H int nvlist_lookup_uint16(const nvlist_t *, const char *,

+ uint16_t *);

+_SYS_NVPAIR_H int nvlist_lookup_int32(const nvlist_t *, const char *,

+ int32_t *);

+_SYS_NVPAIR_H int nvlist_lookup_uint32(const nvlist_t *, const char *,

+ uint32_t *);

+_SYS_NVPAIR_H int nvlist_lookup_int64(const nvlist_t *, const char *,

+ int64_t *);

+_SYS_NVPAIR_H int nvlist_lookup_uint64(const nvlist_t *, const char *,

+ uint64_t *);

_SYS_NVPAIR_H int nvlist_lookup_string(nvlist_t *, const char *, char **);

_SYS_NVPAIR_H int nvlist_lookup_nvlist(nvlist_t *, const char *, nvlist_t **);

_SYS_NVPAIR_H int nvlist_lookup_boolean_array(nvlist_t *, const char *,

@@ -254,31 +261,32 @@ _SYS_NVPAIR_H int nvlist_lookup_nvlist_array(nvlist_t *, const char *,

_SYS_NVPAIR_H int nvlist_lookup_hrtime(nvlist_t *, const char *, hrtime_t *);

_SYS_NVPAIR_H int nvlist_lookup_pairs(nvlist_t *, int, ...);

#if !defined(_KERNEL) && !defined(_STANDALONE)

-_SYS_NVPAIR_H int nvlist_lookup_double(nvlist_t *, const char *, double *);

+_SYS_NVPAIR_H int nvlist_lookup_double(const nvlist_t *, const char *,

+ double *);

#endif

_SYS_NVPAIR_H int nvlist_lookup_nvpair(nvlist_t *, const char *, nvpair_t **);

_SYS_NVPAIR_H int nvlist_lookup_nvpair_embedded_index(nvlist_t *, const char *,

nvpair_t **, int *, char **);

-_SYS_NVPAIR_H boolean_t nvlist_exists(nvlist_t *, const char *);

-_SYS_NVPAIR_H boolean_t nvlist_empty(nvlist_t *);

+_SYS_NVPAIR_H boolean_t nvlist_exists(const nvlist_t *, const char *);

+_SYS_NVPAIR_H boolean_t nvlist_empty(const nvlist_t *);

/* processing nvpair */

-_SYS_NVPAIR_H nvpair_t *nvlist_next_nvpair(nvlist_t *, nvpair_t *);

-_SYS_NVPAIR_H nvpair_t *nvlist_prev_nvpair(nvlist_t *, nvpair_t *);

-_SYS_NVPAIR_H char *nvpair_name(nvpair_t *);

-_SYS_NVPAIR_H data_type_t nvpair_type(nvpair_t *);

-_SYS_NVPAIR_H int nvpair_type_is_array(nvpair_t *);

-_SYS_NVPAIR_H int nvpair_value_boolean_value(nvpair_t *, boolean_t *);

-_SYS_NVPAIR_H int nvpair_value_byte(nvpair_t *, uchar_t *);

-_SYS_NVPAIR_H int nvpair_value_int8(nvpair_t *, int8_t *);

-_SYS_NVPAIR_H int nvpair_value_uint8(nvpair_t *, uint8_t *);

-_SYS_NVPAIR_H int nvpair_value_int16(nvpair_t *, int16_t *);

-_SYS_NVPAIR_H int nvpair_value_uint16(nvpair_t *, uint16_t *);

-_SYS_NVPAIR_H int nvpair_value_int32(nvpair_t *, int32_t *);

-_SYS_NVPAIR_H int nvpair_value_uint32(nvpair_t *, uint32_t *);

-_SYS_NVPAIR_H int nvpair_value_int64(nvpair_t *, int64_t *);

-_SYS_NVPAIR_H int nvpair_value_uint64(nvpair_t *, uint64_t *);

+_SYS_NVPAIR_H nvpair_t *nvlist_next_nvpair(nvlist_t *, const nvpair_t *);

+_SYS_NVPAIR_H nvpair_t *nvlist_prev_nvpair(nvlist_t *, const nvpair_t *);

+_SYS_NVPAIR_H char *nvpair_name(const nvpair_t *);

+_SYS_NVPAIR_H data_type_t nvpair_type(const nvpair_t *);

+_SYS_NVPAIR_H int nvpair_type_is_array(const nvpair_t *);

+_SYS_NVPAIR_H int nvpair_value_boolean_value(const nvpair_t *, boolean_t *);

+_SYS_NVPAIR_H int nvpair_value_byte(const nvpair_t *, uchar_t *);

+_SYS_NVPAIR_H int nvpair_value_int8(const nvpair_t *, int8_t *);

+_SYS_NVPAIR_H int nvpair_value_uint8(const nvpair_t *, uint8_t *);

+_SYS_NVPAIR_H int nvpair_value_int16(const nvpair_t *, int16_t *);

+_SYS_NVPAIR_H int nvpair_value_uint16(const nvpair_t *, uint16_t *);

+_SYS_NVPAIR_H int nvpair_value_int32(const nvpair_t *, int32_t *);

+_SYS_NVPAIR_H int nvpair_value_uint32(const nvpair_t *, uint32_t *);

+_SYS_NVPAIR_H int nvpair_value_int64(const nvpair_t *, int64_t *);

+_SYS_NVPAIR_H int nvpair_value_uint64(const nvpair_t *, uint64_t *);

_SYS_NVPAIR_H int nvpair_value_string(nvpair_t *, char **);

_SYS_NVPAIR_H int nvpair_value_nvlist(nvpair_t *, nvlist_t **);

_SYS_NVPAIR_H int nvpair_value_boolean_array(nvpair_t *, boolean_t **,

@@ -296,7 +304,7 @@ _SYS_NVPAIR_H int nvpair_value_string_array(nvpair_t *, char ***, uint_t *);

_SYS_NVPAIR_H int nvpair_value_nvlist_array(nvpair_t *, nvlist_t ***, uint_t *);

_SYS_NVPAIR_H int nvpair_value_hrtime(nvpair_t *, hrtime_t *);

#if !defined(_KERNEL) && !defined(_STANDALONE)

-_SYS_NVPAIR_H int nvpair_value_double(nvpair_t *, double *);

+_SYS_NVPAIR_H int nvpair_value_double(const nvpair_t *, double *);

#endif

_SYS_NVPAIR_H nvlist_t *fnvlist_alloc(void);

@@ -305,7 +313,7 @@ _SYS_NVPAIR_H size_t fnvlist_size(nvlist_t *);

_SYS_NVPAIR_H char *fnvlist_pack(nvlist_t *, size_t *);

_SYS_NVPAIR_H void fnvlist_pack_free(char *, size_t);

_SYS_NVPAIR_H nvlist_t *fnvlist_unpack(char *, size_t);

-_SYS_NVPAIR_H nvlist_t *fnvlist_dup(nvlist_t *);

+_SYS_NVPAIR_H nvlist_t *fnvlist_dup(const nvlist_t *);

_SYS_NVPAIR_H void fnvlist_merge(nvlist_t *, nvlist_t *);

_SYS_NVPAIR_H size_t fnvlist_num_pairs(nvlist_t *);

@@ -325,45 +333,46 @@ _SYS_NVPAIR_H void fnvlist_add_string(nvlist_t *, const char *, const char *);

_SYS_NVPAIR_H void fnvlist_add_nvlist(nvlist_t *, const char *, nvlist_t *);

_SYS_NVPAIR_H void fnvlist_add_nvpair(nvlist_t *, nvpair_t *);

_SYS_NVPAIR_H void fnvlist_add_boolean_array(nvlist_t *, const char *,

- boolean_t *, uint_t);

-_SYS_NVPAIR_H void fnvlist_add_byte_array(nvlist_t *, const char *, uchar_t *,

- uint_t);

-_SYS_NVPAIR_H void fnvlist_add_int8_array(nvlist_t *, const char *, int8_t *,

- uint_t);

-_SYS_NVPAIR_H void fnvlist_add_uint8_array(nvlist_t *, const char *, uint8_t *,

- uint_t);

-_SYS_NVPAIR_H void fnvlist_add_int16_array(nvlist_t *, const char *, int16_t *,

- uint_t);

+ const boolean_t *, uint_t);

+_SYS_NVPAIR_H void fnvlist_add_byte_array(nvlist_t *, const char *,

+ const uchar_t *, uint_t);

+_SYS_NVPAIR_H void fnvlist_add_int8_array(nvlist_t *, const char *,

+ const int8_t *, uint_t);

+_SYS_NVPAIR_H void fnvlist_add_uint8_array(nvlist_t *, const char *,

+ const uint8_t *, uint_t);

+_SYS_NVPAIR_H void fnvlist_add_int16_array(nvlist_t *, const char *,

+ const int16_t *, uint_t);

_SYS_NVPAIR_H void fnvlist_add_uint16_array(nvlist_t *, const char *,

- uint16_t *, uint_t);

-_SYS_NVPAIR_H void fnvlist_add_int32_array(nvlist_t *, const char *, int32_t *,

- uint_t);

+ const uint16_t *, uint_t);

+_SYS_NVPAIR_H void fnvlist_add_int32_array(nvlist_t *, const char *,

+ const int32_t *, uint_t);

_SYS_NVPAIR_H void fnvlist_add_uint32_array(nvlist_t *, const char *,

- uint32_t *, uint_t);

-_SYS_NVPAIR_H void fnvlist_add_int64_array(nvlist_t *, const char *, int64_t *,

- uint_t);

+ const uint32_t *, uint_t);

+_SYS_NVPAIR_H void fnvlist_add_int64_array(nvlist_t *, const char *,

+ const int64_t *, uint_t);

_SYS_NVPAIR_H void fnvlist_add_uint64_array(nvlist_t *, const char *,

- uint64_t *, uint_t);

+ const uint64_t *, uint_t);

_SYS_NVPAIR_H void fnvlist_add_string_array(nvlist_t *, const char *,

- char * const *, uint_t);

+ const char * const *, uint_t);

_SYS_NVPAIR_H void fnvlist_add_nvlist_array(nvlist_t *, const char *,

- nvlist_t **, uint_t);

+ const nvlist_t * const *, uint_t);

_SYS_NVPAIR_H void fnvlist_remove(nvlist_t *, const char *);

_SYS_NVPAIR_H void fnvlist_remove_nvpair(nvlist_t *, nvpair_t *);

_SYS_NVPAIR_H nvpair_t *fnvlist_lookup_nvpair(nvlist_t *, const char *);

-_SYS_NVPAIR_H boolean_t fnvlist_lookup_boolean(nvlist_t *, const char *);

-_SYS_NVPAIR_H boolean_t fnvlist_lookup_boolean_value(nvlist_t *, const char *);

-_SYS_NVPAIR_H uchar_t fnvlist_lookup_byte(nvlist_t *, const char *);

-_SYS_NVPAIR_H int8_t fnvlist_lookup_int8(nvlist_t *, const char *);

-_SYS_NVPAIR_H int16_t fnvlist_lookup_int16(nvlist_t *, const char *);

-_SYS_NVPAIR_H int32_t fnvlist_lookup_int32(nvlist_t *, const char *);

-_SYS_NVPAIR_H int64_t fnvlist_lookup_int64(nvlist_t *, const char *);

-_SYS_NVPAIR_H uint8_t fnvlist_lookup_uint8(nvlist_t *, const char *);

-_SYS_NVPAIR_H uint16_t fnvlist_lookup_uint16(nvlist_t *, const char *);

-_SYS_NVPAIR_H uint32_t fnvlist_lookup_uint32(nvlist_t *, const char *);

-_SYS_NVPAIR_H uint64_t fnvlist_lookup_uint64(nvlist_t *, const char *);

+_SYS_NVPAIR_H boolean_t fnvlist_lookup_boolean(const nvlist_t *, const char *);

+_SYS_NVPAIR_H boolean_t fnvlist_lookup_boolean_value(const nvlist_t *,

+ const char *);

+_SYS_NVPAIR_H uchar_t fnvlist_lookup_byte(const nvlist_t *, const char *);

+_SYS_NVPAIR_H int8_t fnvlist_lookup_int8(const nvlist_t *, const char *);

+_SYS_NVPAIR_H int16_t fnvlist_lookup_int16(const nvlist_t *, const char *);

+_SYS_NVPAIR_H int32_t fnvlist_lookup_int32(const nvlist_t *, const char *);

+_SYS_NVPAIR_H int64_t fnvlist_lookup_int64(const nvlist_t *, const char *);

+_SYS_NVPAIR_H uint8_t fnvlist_lookup_uint8(const nvlist_t *, const char *);

+_SYS_NVPAIR_H uint16_t fnvlist_lookup_uint16(const nvlist_t *, const char *);

+_SYS_NVPAIR_H uint32_t fnvlist_lookup_uint32(const nvlist_t *, const char *);

+_SYS_NVPAIR_H uint64_t fnvlist_lookup_uint64(const nvlist_t *, const char *);

_SYS_NVPAIR_H char *fnvlist_lookup_string(nvlist_t *, const char *);

_SYS_NVPAIR_H nvlist_t *fnvlist_lookup_nvlist(nvlist_t *, const char *);

_SYS_NVPAIR_H boolean_t *fnvlist_lookup_boolean_array(nvlist_t *, const char *,

@@ -387,16 +396,16 @@ _SYS_NVPAIR_H int64_t *fnvlist_lookup_int64_array(nvlist_t *, const char *,

_SYS_NVPAIR_H uint64_t *fnvlist_lookup_uint64_array(nvlist_t *, const char *,

uint_t *);

-_SYS_NVPAIR_H boolean_t fnvpair_value_boolean_value(nvpair_t *nvp);

-_SYS_NVPAIR_H uchar_t fnvpair_value_byte(nvpair_t *nvp);

-_SYS_NVPAIR_H int8_t fnvpair_value_int8(nvpair_t *nvp);

-_SYS_NVPAIR_H int16_t fnvpair_value_int16(nvpair_t *nvp);

-_SYS_NVPAIR_H int32_t fnvpair_value_int32(nvpair_t *nvp);

-_SYS_NVPAIR_H int64_t fnvpair_value_int64(nvpair_t *nvp);

-_SYS_NVPAIR_H uint8_t fnvpair_value_uint8(nvpair_t *nvp);

-_SYS_NVPAIR_H uint16_t fnvpair_value_uint16(nvpair_t *nvp);

-_SYS_NVPAIR_H uint32_t fnvpair_value_uint32(nvpair_t *nvp);

-_SYS_NVPAIR_H uint64_t fnvpair_value_uint64(nvpair_t *nvp);

+_SYS_NVPAIR_H boolean_t fnvpair_value_boolean_value(const nvpair_t *nvp);

+_SYS_NVPAIR_H uchar_t fnvpair_value_byte(const nvpair_t *nvp);

+_SYS_NVPAIR_H int8_t fnvpair_value_int8(const nvpair_t *nvp);

+_SYS_NVPAIR_H int16_t fnvpair_value_int16(const nvpair_t *nvp);

+_SYS_NVPAIR_H int32_t fnvpair_value_int32(const nvpair_t *nvp);

+_SYS_NVPAIR_H int64_t fnvpair_value_int64(const nvpair_t *nvp);

+_SYS_NVPAIR_H uint8_t fnvpair_value_uint8(const nvpair_t *nvp);

+_SYS_NVPAIR_H uint16_t fnvpair_value_uint16(const nvpair_t *nvp);

+_SYS_NVPAIR_H uint32_t fnvpair_value_uint32(const nvpair_t *nvp);

+_SYS_NVPAIR_H uint64_t fnvpair_value_uint64(const nvpair_t *nvp);

_SYS_NVPAIR_H char *fnvpair_value_string(nvpair_t *nvp);

_SYS_NVPAIR_H nvlist_t *fnvpair_value_nvlist(nvpair_t *nvp);

diff --git a/include/sys/nvpair_impl.h b/include/sys/nvpair_impl.h
index c9874b3e4db7..809e5c454712 100644
--- a/include/sys/nvpair_impl.h
+++ b/include/sys/nvpair_impl.h

@@ -74,7 +74,7 @@ struct i_nvp {

typedef struct {

i_nvp_t *nvp_list; /* linked list of nvpairs */

i_nvp_t *nvp_last; /* last nvpair */

- i_nvp_t *nvp_curr; /* current walker nvpair */

+ const i_nvp_t *nvp_curr; /* current walker nvpair */

nv_alloc_t *nvp_nva; /* pluggable allocator */

uint32_t nvp_stat; /* internal state */

diff --git a/lib/libnvpair/libnvpair.abi b/lib/libnvpair/libnvpair.abi
index 9c27d178dc05..4a001c3dc3a6 100644
--- a/lib/libnvpair/libnvpair.abi
+++ b/lib/libnvpair/libnvpair.abi

@@ -3,6 +3,8 @@

</elf-needed>

<elf-function-symbols>

+ <elf-symbol name='_fini' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>

+ <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>

<elf-symbol name='dump_nvlist' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>

<elf-symbol name='fnvlist_add_boolean' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>

<elf-symbol name='fnvlist_add_boolean_array' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>

@@ -262,7 +264,7 @@

</function-decl>

<function-decl name='fnvlist_dup' mangled-name='fnvlist_dup' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_dup'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='fnvlist_merge' mangled-name='fnvlist_merge' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_merge'>

@@ -359,84 +361,84 @@

<function-decl name='fnvlist_add_boolean_array' mangled-name='fnvlist_add_boolean_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_boolean_array'>

- <parameter type-id='37e3bd22' name='val'/>

+ <parameter type-id='c5f6c15b' name='val'/>

</function-decl>

<function-decl name='fnvlist_add_byte_array' mangled-name='fnvlist_add_byte_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_byte_array'>

- <parameter type-id='45b65157' name='val'/>

+ <parameter type-id='d1db479e' name='val'/>

</function-decl>

<function-decl name='fnvlist_add_int8_array' mangled-name='fnvlist_add_int8_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_int8_array'>

- <parameter type-id='256d5229' name='val'/>

+ <parameter type-id='a06445da' name='val'/>

</function-decl>

<function-decl name='fnvlist_add_uint8_array' mangled-name='fnvlist_add_uint8_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_uint8_array'>

- <parameter type-id='ae3e8ca6' name='val'/>

+ <parameter type-id='9f7200cf' name='val'/>

</function-decl>

<function-decl name='fnvlist_add_int16_array' mangled-name='fnvlist_add_int16_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_int16_array'>

- <parameter type-id='f76f73d0' name='val'/>

+ <parameter type-id='a3eb883d' name='val'/>

</function-decl>

<function-decl name='fnvlist_add_uint16_array' mangled-name='fnvlist_add_uint16_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_uint16_array'>

- <parameter type-id='8a121f49' name='val'/>

+ <parameter type-id='1b7d11c6' name='val'/>

</function-decl>

<function-decl name='fnvlist_add_int32_array' mangled-name='fnvlist_add_int32_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_int32_array'>

- <parameter type-id='4aafb922' name='val'/>

+ <parameter type-id='1f526493' name='val'/>

</function-decl>

<function-decl name='fnvlist_add_uint32_array' mangled-name='fnvlist_add_uint32_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_uint32_array'>

- <parameter type-id='90421557' name='val'/>

+ <parameter type-id='a6798dcc' name='val'/>

</function-decl>

<function-decl name='fnvlist_add_int64_array' mangled-name='fnvlist_add_int64_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_int64_array'>

- <parameter type-id='cb785ebf' name='val'/>

+ <parameter type-id='505bed1a' name='val'/>

</function-decl>

<function-decl name='fnvlist_add_uint64_array' mangled-name='fnvlist_add_uint64_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_uint64_array'>

- <parameter type-id='5d6479ae' name='val'/>

+ <parameter type-id='713a56f5' name='val'/>

</function-decl>

<function-decl name='fnvlist_add_string_array' mangled-name='fnvlist_add_string_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_string_array'>

- <parameter type-id='f319fae0' name='val'/>

+ <parameter type-id='13956559' name='val'/>

</function-decl>

<function-decl name='fnvlist_add_nvlist_array' mangled-name='fnvlist_add_nvlist_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_nvlist_array'>

- <parameter type-id='857bb57e' name='val'/>

+ <parameter type-id='3bbfee2e' name='val'/>

</function-decl>

@@ -456,57 +458,57 @@

</function-decl>

<function-decl name='fnvlist_lookup_boolean' mangled-name='fnvlist_lookup_boolean' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_boolean'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='fnvlist_lookup_boolean_value' mangled-name='fnvlist_lookup_boolean_value' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_boolean_value'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='fnvlist_lookup_byte' mangled-name='fnvlist_lookup_byte' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_byte'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='fnvlist_lookup_int8' mangled-name='fnvlist_lookup_int8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_int8'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='fnvlist_lookup_int16' mangled-name='fnvlist_lookup_int16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_int16'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='fnvlist_lookup_int32' mangled-name='fnvlist_lookup_int32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_int32'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='fnvlist_lookup_int64' mangled-name='fnvlist_lookup_int64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_int64'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='fnvlist_lookup_uint8' mangled-name='fnvlist_lookup_uint8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_uint8'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='fnvlist_lookup_uint16' mangled-name='fnvlist_lookup_uint16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_uint16'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='fnvlist_lookup_uint32' mangled-name='fnvlist_lookup_uint32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_uint32'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='fnvlist_lookup_uint64' mangled-name='fnvlist_lookup_uint64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_uint64'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

@@ -581,43 +583,43 @@

</function-decl>

<function-decl name='fnvpair_value_boolean_value' mangled-name='fnvpair_value_boolean_value' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_boolean_value'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='fnvpair_value_byte' mangled-name='fnvpair_value_byte' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_byte'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='fnvpair_value_int8' mangled-name='fnvpair_value_int8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_int8'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='fnvpair_value_int16' mangled-name='fnvpair_value_int16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_int16'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='fnvpair_value_int32' mangled-name='fnvpair_value_int32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_int32'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='fnvpair_value_int64' mangled-name='fnvpair_value_int64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_int64'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='fnvpair_value_uint8' mangled-name='fnvpair_value_uint8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_uint8'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='fnvpair_value_uint16' mangled-name='fnvpair_value_uint16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_uint16'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='fnvpair_value_uint32' mangled-name='fnvpair_value_uint32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_uint32'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='fnvpair_value_uint64' mangled-name='fnvpair_value_uint64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_uint64'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='fnvpair_value_string' mangled-name='fnvpair_value_string' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_string'>

@@ -631,9 +633,35 @@

</abi-instr>

<abi-instr address-size='64' path='../../module/nvpair/nvpair.c' language='LANG_C99'>

<pointer-type-def type-id='37e3bd22' size-in-bits='64' id='03829398'/>

- <qualified-type-def type-id='26a90f95' const='yes' id='57de658a'/>

- <pointer-type-def type-id='57de658a' size-in-bits='64' id='f319fae0'/>

<pointer-type-def type-id='9b23c9ad' size-in-bits='64' id='c0563f85'/>

+ <qualified-type-def type-id='c19b74c3' const='yes' id='12373e33'/>

+ <pointer-type-def type-id='12373e33' size-in-bits='64' id='c5f6c15b'/>

+ <qualified-type-def type-id='80f4b756' const='yes' id='b99c00c9'/>

+ <pointer-type-def type-id='b99c00c9' size-in-bits='64' id='13956559'/>

+ <qualified-type-def type-id='23bd8cb5' const='yes' id='75f7b0c5'/>

+ <pointer-type-def type-id='75f7b0c5' size-in-bits='64' id='a3eb883d'/>

+ <qualified-type-def type-id='3ff5601b' const='yes' id='922df12b'/>

+ <pointer-type-def type-id='922df12b' size-in-bits='64' id='1f526493'/>

+ <qualified-type-def type-id='9da381c4' const='yes' id='f07b7694'/>

+ <pointer-type-def type-id='f07b7694' size-in-bits='64' id='505bed1a'/>

+ <qualified-type-def type-id='ee31ee44' const='yes' id='721c32d4'/>

+ <pointer-type-def type-id='721c32d4' size-in-bits='64' id='a06445da'/>

+ <qualified-type-def type-id='8e8d4be3' const='yes' id='693c3853'/>

+ <pointer-type-def type-id='693c3853' size-in-bits='64' id='22cce67b'/>

+ <qualified-type-def type-id='22cce67b' const='yes' id='d2816df0'/>

+ <pointer-type-def type-id='d2816df0' size-in-bits='64' id='3bbfee2e'/>

+ <qualified-type-def type-id='57928edf' const='yes' id='642ee20f'/>

+ <pointer-type-def type-id='642ee20f' size-in-bits='64' id='dace003f'/>

+ <qualified-type-def type-id='d8bf0010' const='yes' id='a9125480'/>

+ <pointer-type-def type-id='a9125480' size-in-bits='64' id='d1db479e'/>

+ <qualified-type-def type-id='149c6638' const='yes' id='b01a5ac8'/>

+ <pointer-type-def type-id='b01a5ac8' size-in-bits='64' id='1b7d11c6'/>

+ <qualified-type-def type-id='8f92235e' const='yes' id='b9930aae'/>

+ <pointer-type-def type-id='b9930aae' size-in-bits='64' id='a6798dcc'/>

+ <qualified-type-def type-id='9c313c2d' const='yes' id='c3b7ba7d'/>

+ <pointer-type-def type-id='c3b7ba7d' size-in-bits='64' id='713a56f5'/>

+ <qualified-type-def type-id='b96825af' const='yes' id='2b61797f'/>

+ <pointer-type-def type-id='2b61797f' size-in-bits='64' id='9f7200cf'/>

<pointer-type-def type-id='a0eb0f08' size-in-bits='64' id='7408d286'/>

<pointer-type-def type-id='cebdd548' size-in-bits='64' id='e379e62d'/>

<pointer-type-def type-id='95e97e5e' size-in-bits='64' id='7292109c'/>

@@ -689,13 +717,13 @@

</function-decl>

<function-decl name='nvlist_dup' mangled-name='nvlist_dup' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_dup'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='nvlist_xdup' mangled-name='nvlist_xdup' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_xdup'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

@@ -796,77 +824,77 @@

<function-decl name='nvlist_add_boolean_array' mangled-name='nvlist_add_boolean_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_boolean_array'>

- <parameter type-id='37e3bd22' name='a'/>

+ <parameter type-id='c5f6c15b' name='a'/>

</function-decl>

<function-decl name='nvlist_add_byte_array' mangled-name='nvlist_add_byte_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_byte_array'>

- <parameter type-id='45b65157' name='a'/>

+ <parameter type-id='d1db479e' name='a'/>

</function-decl>

<function-decl name='nvlist_add_int8_array' mangled-name='nvlist_add_int8_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_int8_array'>

- <parameter type-id='256d5229' name='a'/>

+ <parameter type-id='a06445da' name='a'/>

</function-decl>

<function-decl name='nvlist_add_uint8_array' mangled-name='nvlist_add_uint8_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_uint8_array'>

- <parameter type-id='ae3e8ca6' name='a'/>

+ <parameter type-id='9f7200cf' name='a'/>

</function-decl>

<function-decl name='nvlist_add_int16_array' mangled-name='nvlist_add_int16_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_int16_array'>

- <parameter type-id='f76f73d0' name='a'/>

+ <parameter type-id='a3eb883d' name='a'/>

</function-decl>

<function-decl name='nvlist_add_uint16_array' mangled-name='nvlist_add_uint16_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_uint16_array'>

- <parameter type-id='8a121f49' name='a'/>

+ <parameter type-id='1b7d11c6' name='a'/>

</function-decl>

<function-decl name='nvlist_add_int32_array' mangled-name='nvlist_add_int32_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_int32_array'>

- <parameter type-id='4aafb922' name='a'/>

+ <parameter type-id='1f526493' name='a'/>

</function-decl>

<function-decl name='nvlist_add_uint32_array' mangled-name='nvlist_add_uint32_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_uint32_array'>

- <parameter type-id='90421557' name='a'/>

+ <parameter type-id='a6798dcc' name='a'/>

</function-decl>

<function-decl name='nvlist_add_int64_array' mangled-name='nvlist_add_int64_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_int64_array'>

- <parameter type-id='cb785ebf' name='a'/>

+ <parameter type-id='505bed1a' name='a'/>

</function-decl>

<function-decl name='nvlist_add_uint64_array' mangled-name='nvlist_add_uint64_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_uint64_array'>

- <parameter type-id='5d6479ae' name='a'/>

+ <parameter type-id='713a56f5' name='a'/>

</function-decl>

<function-decl name='nvlist_add_string_array' mangled-name='nvlist_add_string_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_string_array'>

- <parameter type-id='f319fae0' name='a'/>

+ <parameter type-id='13956559' name='a'/>

</function-decl>

@@ -879,109 +907,109 @@

<function-decl name='nvlist_add_nvlist' mangled-name='nvlist_add_nvlist' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_nvlist'>

- <parameter type-id='5ce45b60' name='val'/>

+ <parameter type-id='22cce67b' name='val'/>

</function-decl>

<function-decl name='nvlist_add_nvlist_array' mangled-name='nvlist_add_nvlist_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_nvlist_array'>

- <parameter type-id='857bb57e' name='a'/>

+ <parameter type-id='3bbfee2e' name='a'/>

</function-decl>

<function-decl name='nvlist_next_nvpair' mangled-name='nvlist_next_nvpair' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_next_nvpair'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='nvlist_prev_nvpair' mangled-name='nvlist_prev_nvpair' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prev_nvpair'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='nvlist_empty' mangled-name='nvlist_empty' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_empty'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='nvpair_name' mangled-name='nvpair_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_name'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='nvpair_type' mangled-name='nvpair_type' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_type'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='nvpair_type_is_array' mangled-name='nvpair_type_is_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_type_is_array'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='nvlist_lookup_boolean' mangled-name='nvlist_lookup_boolean' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_boolean'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='nvlist_lookup_boolean_value' mangled-name='nvlist_lookup_boolean_value' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_boolean_value'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='nvlist_lookup_byte' mangled-name='nvlist_lookup_byte' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_byte'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='nvlist_lookup_int8' mangled-name='nvlist_lookup_int8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_int8'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='nvlist_lookup_uint8' mangled-name='nvlist_lookup_uint8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_uint8'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='nvlist_lookup_int16' mangled-name='nvlist_lookup_int16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_int16'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='nvlist_lookup_uint16' mangled-name='nvlist_lookup_uint16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_uint16'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='nvlist_lookup_int32' mangled-name='nvlist_lookup_int32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_int32'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='nvlist_lookup_uint32' mangled-name='nvlist_lookup_uint32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_uint32'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='nvlist_lookup_int64' mangled-name='nvlist_lookup_int64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_int64'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='nvlist_lookup_uint64' mangled-name='nvlist_lookup_uint64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_uint64'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='nvlist_lookup_double' mangled-name='nvlist_lookup_double' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_double'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

@@ -1109,62 +1137,62 @@

</function-decl>

<function-decl name='nvlist_exists' mangled-name='nvlist_exists' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_exists'>

- <parameter type-id='5ce45b60' name='nvl'/>

+ <parameter type-id='22cce67b' name='nvl'/>

</function-decl>

<function-decl name='nvpair_value_boolean_value' mangled-name='nvpair_value_boolean_value' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_boolean_value'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='nvpair_value_byte' mangled-name='nvpair_value_byte' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_byte'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='nvpair_value_int8' mangled-name='nvpair_value_int8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_int8'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='nvpair_value_uint8' mangled-name='nvpair_value_uint8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_uint8'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='nvpair_value_int16' mangled-name='nvpair_value_int16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_int16'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='nvpair_value_uint16' mangled-name='nvpair_value_uint16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_uint16'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='nvpair_value_int32' mangled-name='nvpair_value_int32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_int32'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='nvpair_value_uint32' mangled-name='nvpair_value_uint32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_uint32'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='nvpair_value_int64' mangled-name='nvpair_value_int64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_int64'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='nvpair_value_uint64' mangled-name='nvpair_value_uint64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_uint64'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

<function-decl name='nvpair_value_double' mangled-name='nvpair_value_double' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_double'>

- <parameter type-id='3fa542f0' name='nvp'/>

+ <parameter type-id='dace003f' name='nvp'/>

</function-decl>

@@ -1314,10 +1342,6 @@

<array-type-def dimensions='1' type-id='a84c031d' size-in-bits='160' id='664ac0b7'>

</array-type-def>

- <class-decl name='_IO_codecvt' is-struct='yes' visibility='default' is-declaration-only='yes' id='a4036571'/>

- <class-decl name='_IO_marker' is-struct='yes' visibility='default' is-declaration-only='yes' id='010ae0b9'/>

- <class-decl name='_IO_wide_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='79bd3751'/>

- <class-decl name='re_dfa_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='b48d2441'/>

<type-decl name='double' size-in-bits='64' id='a0eb0f08'/>

<type-decl name='int' size-in-bits='32' id='95e97e5e'/>

<type-decl name='long int' size-in-bits='64' id='bd54fe1a'/>

@@ -1330,7 +1354,6 @@

<type-decl name='unsigned long int' size-in-bits='64' id='7359adad'/>

<type-decl name='unsigned short int' size-in-bits='16' id='8efea9e5'/>

<type-decl name='variadic parameter type' id='2c1145c5'/>

- <type-decl name='void' id='48b5725f'/>

<typedef-decl name='nvlist_prtctl_t' type-id='196db161' id='b0c1ff8d'/>

<enum-decl name='nvlist_indent_mode' id='628aafab'>

<underlying-type type-id='9cac1fee'/>

@@ -1752,17 +1775,16 @@

<var-decl name='nvprt_custops' type-id='7be54adb' visibility='default'/>

</data-member>

</class-decl>

- <typedef-decl name='__re_long_size_t' type-id='7359adad' id='ba516949'/>

<typedef-decl name='reg_syntax_t' type-id='7359adad' id='1b72c3b3'/>

<class-decl name='re_pattern_buffer' size-in-bits='512' is-struct='yes' visibility='default' id='19fc9a8c'>

<data-member access='public' layout-offset-in-bits='0'>

- <var-decl name='buffer' type-id='33976309' visibility='default'/>

+ <var-decl name='buffer' type-id='cf536864' visibility='default'/>

</data-member>

<data-member access='public' layout-offset-in-bits='64'>

- <var-decl name='allocated' type-id='ba516949' visibility='default'/>

+ <var-decl name='allocated' type-id='7359adad' visibility='default'/>

</data-member>

<data-member access='public' layout-offset-in-bits='128'>

- <var-decl name='used' type-id='ba516949' visibility='default'/>

+ <var-decl name='used' type-id='7359adad' visibility='default'/>

</data-member>

<data-member access='public' layout-offset-in-bits='192'>

<var-decl name='syntax' type-id='1b72c3b3' visibility='default'/>

@@ -1799,26 +1821,18 @@

</data-member>

</class-decl>

<typedef-decl name='regex_t' type-id='19fc9a8c' id='aca3bac8'/>

- <typedef-decl name='int8_t' type-id='2171a512' id='ee31ee44'/>

- <typedef-decl name='int16_t' type-id='03896e23' id='23bd8cb5'/>

- <typedef-decl name='int32_t' type-id='33f57a65' id='3ff5601b'/>

- <typedef-decl name='int64_t' type-id='0c9942d2' id='9da381c4'/>

- <typedef-decl name='uint8_t' type-id='c51d6389' id='b96825af'/>

- <typedef-decl name='uint16_t' type-id='253c2d2a' id='149c6638'/>

- <typedef-decl name='uint32_t' type-id='62f1140c' id='8f92235e'/>

- <typedef-decl name='uint64_t' type-id='8910171f' id='9c313c2d'/>

- <typedef-decl name='__int8_t' type-id='28577a57' id='2171a512'/>

- <typedef-decl name='__uint8_t' type-id='002ac4a6' id='c51d6389'/>

- <typedef-decl name='__int16_t' type-id='a2185560' id='03896e23'/>

- <typedef-decl name='__uint16_t' type-id='8efea9e5' id='253c2d2a'/>

- <typedef-decl name='__int32_t' type-id='95e97e5e' id='33f57a65'/>

- <typedef-decl name='__uint32_t' type-id='f0981eeb' id='62f1140c'/>

- <typedef-decl name='__int64_t' type-id='bd54fe1a' id='0c9942d2'/>

- <typedef-decl name='__uint64_t' type-id='7359adad' id='8910171f'/>

- <typedef-decl name='__off_t' type-id='bd54fe1a' id='79989e9c'/>

- <typedef-decl name='__off64_t' type-id='bd54fe1a' id='724e4de6'/>

- <typedef-decl name='FILE' type-id='ec1ed955' id='aa12d1ba'/>

<typedef-decl name='_IO_lock_t' type-id='48b5725f' id='bb4788fa'/>

+ <class-decl name='_IO_marker' size-in-bits='192' is-struct='yes' visibility='default' id='010ae0b9'>

+ <data-member access='public' layout-offset-in-bits='0'>

+ <var-decl name='_next' type-id='e4c6fa61' visibility='default'/>

+ </data-member>

+ <data-member access='public' layout-offset-in-bits='64'>

+ <var-decl name='_sbuf' type-id='dca988a5' visibility='default'/>

+ </data-member>

+ <data-member access='public' layout-offset-in-bits='128'>

+ <var-decl name='_pos' type-id='95e97e5e' visibility='default'/>

+ </data-member>

+ </class-decl>

<class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' id='ec1ed955'>

<data-member access='public' layout-offset-in-bits='0'>

<var-decl name='_flags' type-id='95e97e5e' visibility='default'/>

@@ -1887,16 +1901,16 @@

<var-decl name='_offset' type-id='724e4de6' visibility='default'/>

</data-member>

<data-member access='public' layout-offset-in-bits='1216'>

- <var-decl name='_codecvt' type-id='570f8c59' visibility='default'/>

+ <var-decl name='__pad1' type-id='eaa32e2f' visibility='default'/>

</data-member>

<data-member access='public' layout-offset-in-bits='1280'>

- <var-decl name='_wide_data' type-id='c65a1f29' visibility='default'/>

+ <var-decl name='__pad2' type-id='eaa32e2f' visibility='default'/>

</data-member>

<data-member access='public' layout-offset-in-bits='1344'>

- <var-decl name='_freeres_list' type-id='dca988a5' visibility='default'/>

+ <var-decl name='__pad3' type-id='eaa32e2f' visibility='default'/>

</data-member>

<data-member access='public' layout-offset-in-bits='1408'>

- <var-decl name='_freeres_buf' type-id='eaa32e2f' visibility='default'/>

+ <var-decl name='__pad4' type-id='eaa32e2f' visibility='default'/>

</data-member>

<data-member access='public' layout-offset-in-bits='1472'>

<var-decl name='__pad5' type-id='b59d7dce' visibility='default'/>

@@ -1908,13 +1922,30 @@

<var-decl name='_unused2' type-id='664ac0b7' visibility='default'/>

</data-member>

</class-decl>

+ <typedef-decl name='int8_t' type-id='2171a512' id='ee31ee44'/>

+ <typedef-decl name='int16_t' type-id='03896e23' id='23bd8cb5'/>

+ <typedef-decl name='int32_t' type-id='33f57a65' id='3ff5601b'/>

+ <typedef-decl name='int64_t' type-id='0c9942d2' id='9da381c4'/>

+ <typedef-decl name='uint8_t' type-id='c51d6389' id='b96825af'/>

+ <typedef-decl name='uint16_t' type-id='253c2d2a' id='149c6638'/>

+ <typedef-decl name='uint32_t' type-id='62f1140c' id='8f92235e'/>

+ <typedef-decl name='uint64_t' type-id='8910171f' id='9c313c2d'/>

+ <typedef-decl name='__int8_t' type-id='28577a57' id='2171a512'/>

+ <typedef-decl name='__uint8_t' type-id='002ac4a6' id='c51d6389'/>

+ <typedef-decl name='__int16_t' type-id='a2185560' id='03896e23'/>

+ <typedef-decl name='__uint16_t' type-id='8efea9e5' id='253c2d2a'/>

+ <typedef-decl name='__int32_t' type-id='95e97e5e' id='33f57a65'/>

+ <typedef-decl name='__uint32_t' type-id='f0981eeb' id='62f1140c'/>

+ <typedef-decl name='__int64_t' type-id='bd54fe1a' id='0c9942d2'/>

+ <typedef-decl name='__uint64_t' type-id='7359adad' id='8910171f'/>

+ <typedef-decl name='__off_t' type-id='bd54fe1a' id='79989e9c'/>

+ <typedef-decl name='__off64_t' type-id='bd54fe1a' id='724e4de6'/>

+ <typedef-decl name='FILE' type-id='ec1ed955' id='aa12d1ba'/>

<typedef-decl name='size_t' type-id='7359adad' id='b59d7dce'/>

<pointer-type-def type-id='aa12d1ba' size-in-bits='64' id='822cd80b'/>

<pointer-type-def type-id='ec1ed955' size-in-bits='64' id='dca988a5'/>

- <pointer-type-def type-id='a4036571' size-in-bits='64' id='570f8c59'/>

<pointer-type-def type-id='bb4788fa' size-in-bits='64' id='cecf4ea7'/>

<pointer-type-def type-id='010ae0b9' size-in-bits='64' id='e4c6fa61'/>

- <pointer-type-def type-id='79bd3751' size-in-bits='64' id='c65a1f29'/>

<pointer-type-def type-id='c19b74c3' size-in-bits='64' id='37e3bd22'/>

<pointer-type-def type-id='a84c031d' size-in-bits='64' id='26a90f95'/>

<pointer-type-def type-id='26a90f95' size-in-bits='64' id='9b23c9ad'/>

@@ -1983,7 +2014,6 @@

<pointer-type-def type-id='8e8d4be3' size-in-bits='64' id='5ce45b60'/>

<pointer-type-def type-id='5ce45b60' size-in-bits='64' id='857bb57e'/>

<pointer-type-def type-id='57928edf' size-in-bits='64' id='3fa542f0'/>

- <pointer-type-def type-id='b48d2441' size-in-bits='64' id='33976309'/>

<pointer-type-def type-id='aca3bac8' size-in-bits='64' id='d33f11cb'/>

<pointer-type-def type-id='d8bf0010' size-in-bits='64' id='45b65157'/>

<pointer-type-def type-id='149c6638' size-in-bits='64' id='8a121f49'/>

@@ -1992,10 +2022,6 @@

<pointer-type-def type-id='b96825af' size-in-bits='64' id='ae3e8ca6'/>

<pointer-type-def type-id='002ac4a6' size-in-bits='64' id='cf536864'/>

<pointer-type-def type-id='48b5725f' size-in-bits='64' id='eaa32e2f'/>

- <class-decl name='_IO_codecvt' is-struct='yes' visibility='default' is-declaration-only='yes' id='a4036571'/>

- <class-decl name='_IO_marker' is-struct='yes' visibility='default' is-declaration-only='yes' id='010ae0b9'/>

- <class-decl name='_IO_wide_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='79bd3751'/>

- <class-decl name='re_dfa_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='b48d2441'/>

<function-decl name='nvlist_prtctl_setdest' mangled-name='nvlist_prtctl_setdest' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctl_setdest'>

@@ -2684,6 +2710,7 @@

</function-type>

+ <type-decl name='void' id='48b5725f'/>

</abi-instr>

<abi-instr address-size='64' path='libnvpair_json.c' language='LANG_C99'>

<function-decl name='nvlist_print_json' mangled-name='nvlist_print_json' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_print_json'>

diff --git a/lib/libuutil/libuutil.abi b/lib/libuutil/libuutil.abi
index c7ab5672eace..48575ebc6a9f 100644
--- a/lib/libuutil/libuutil.abi
+++ b/lib/libuutil/libuutil.abi

@@ -5,6 +5,8 @@

</elf-needed>

<elf-function-symbols>

+ <elf-symbol name='_fini' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>

+ <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>

<elf-symbol name='_sol_getmntent' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>

<elf-symbol name='atomic_add_16' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>

<elf-symbol name='atomic_add_16_nv' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>

@@ -853,9 +855,6 @@

<array-type-def dimensions='1' type-id='a84c031d' size-in-bits='160' id='664ac0b7'>

</array-type-def>

- <class-decl name='_IO_codecvt' is-struct='yes' visibility='default' is-declaration-only='yes' id='a4036571'/>

- <class-decl name='_IO_marker' is-struct='yes' visibility='default' is-declaration-only='yes' id='010ae0b9'/>

- <class-decl name='_IO_wide_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='79bd3751'/>

<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'/>

@@ -890,66 +889,18 @@

<var-decl name='mnt_minor' type-id='3502e3ff' visibility='default'/>

</data-member>

</class-decl>

- <class-decl name='stat64' size-in-bits='1152' is-struct='yes' visibility='default' id='0bbec9cd'>

+ <typedef-decl name='_IO_lock_t' type-id='48b5725f' id='bb4788fa'/>

+ <class-decl name='_IO_marker' size-in-bits='192' is-struct='yes' visibility='default' id='010ae0b9'>

<data-member access='public' layout-offset-in-bits='0'>

- <var-decl name='st_dev' type-id='35ed8932' visibility='default'/>

+ <var-decl name='_next' type-id='e4c6fa61' visibility='default'/>

</data-member>

<data-member access='public' layout-offset-in-bits='64'>

- <var-decl name='st_ino' type-id='71288a47' visibility='default'/>

+ <var-decl name='_sbuf' type-id='dca988a5' visibility='default'/>

</data-member>

<data-member access='public' layout-offset-in-bits='128'>

- <var-decl name='st_nlink' type-id='80f0b9df' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='192'>

- <var-decl name='st_mode' type-id='e1c52942' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='224'>

- <var-decl name='st_uid' type-id='cc5fcceb' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='256'>

- <var-decl name='st_gid' type-id='d94ec6d9' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='288'>

- <var-decl name='__pad0' type-id='95e97e5e' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='320'>

- <var-decl name='st_rdev' type-id='35ed8932' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='384'>

- <var-decl name='st_size' type-id='79989e9c' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='448'>

- <var-decl name='st_blksize' type-id='d3f10a7f' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='512'>

- <var-decl name='st_blocks' type-id='4e711bf1' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='576'>

- <var-decl name='st_atim' type-id='a9c79a1f' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='704'>

- <var-decl name='st_mtim' type-id='a9c79a1f' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='832'>

- <var-decl name='st_ctim' type-id='a9c79a1f' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='960'>

- <var-decl name='__glibc_reserved' type-id='083f8d58' visibility='default'/>

+ <var-decl name='_pos' type-id='95e97e5e' visibility='default'/>

</data-member>

</class-decl>

- <typedef-decl name='__dev_t' type-id='7359adad' id='35ed8932'/>

- <typedef-decl name='__uid_t' type-id='f0981eeb' id='cc5fcceb'/>

- <typedef-decl name='__gid_t' type-id='f0981eeb' id='d94ec6d9'/>

- <typedef-decl name='__ino64_t' type-id='7359adad' id='71288a47'/>

- <typedef-decl name='__nlink_t' type-id='7359adad' id='80f0b9df'/>

- <typedef-decl name='__off_t' type-id='bd54fe1a' id='79989e9c'/>

- <typedef-decl name='__off64_t' type-id='bd54fe1a' id='724e4de6'/>

- <typedef-decl name='__time_t' type-id='bd54fe1a' id='65eda9c0'/>

- <typedef-decl name='__blksize_t' type-id='bd54fe1a' id='d3f10a7f'/>

- <typedef-decl name='__blkcnt64_t' type-id='bd54fe1a' id='4e711bf1'/>

- <typedef-decl name='__syscall_slong_t' type-id='bd54fe1a' id='03085adc'/>

- <typedef-decl name='FILE' type-id='ec1ed955' id='aa12d1ba'/>

- <typedef-decl name='_IO_lock_t' type-id='48b5725f' id='bb4788fa'/>

<class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' id='ec1ed955'>

<data-member access='public' layout-offset-in-bits='0'>

<var-decl name='_flags' type-id='95e97e5e' visibility='default'/>

@@ -1018,16 +969,16 @@

<var-decl name='_offset' type-id='724e4de6' visibility='default'/>

</data-member>

<data-member access='public' layout-offset-in-bits='1216'>

- <var-decl name='_codecvt' type-id='570f8c59' visibility='default'/>

+ <var-decl name='__pad1' type-id='eaa32e2f' visibility='default'/>

</data-member>

<data-member access='public' layout-offset-in-bits='1280'>

- <var-decl name='_wide_data' type-id='c65a1f29' visibility='default'/>

+ <var-decl name='__pad2' type-id='eaa32e2f' visibility='default'/>

</data-member>

<data-member access='public' layout-offset-in-bits='1344'>

- <var-decl name='_freeres_list' type-id='dca988a5' visibility='default'/>

+ <var-decl name='__pad3' type-id='eaa32e2f' visibility='default'/>

</data-member>

<data-member access='public' layout-offset-in-bits='1408'>

- <var-decl name='_freeres_buf' type-id='eaa32e2f' visibility='default'/>

+ <var-decl name='__pad4' type-id='eaa32e2f' visibility='default'/>

</data-member>

<data-member access='public' layout-offset-in-bits='1472'>

<var-decl name='__pad5' type-id='b59d7dce' visibility='default'/>

@@ -1039,6 +990,65 @@

<var-decl name='_unused2' type-id='664ac0b7' visibility='default'/>

</data-member>

</class-decl>

+ <class-decl name='stat64' size-in-bits='1152' is-struct='yes' visibility='default' id='0bbec9cd'>

+ <data-member access='public' layout-offset-in-bits='0'>

+ <var-decl name='st_dev' type-id='35ed8932' visibility='default'/>

+ </data-member>

+ <data-member access='public' layout-offset-in-bits='64'>

+ <var-decl name='st_ino' type-id='71288a47' visibility='default'/>

+ </data-member>

+ <data-member access='public' layout-offset-in-bits='128'>

+ <var-decl name='st_nlink' type-id='80f0b9df' visibility='default'/>

+ </data-member>

+ <data-member access='public' layout-offset-in-bits='192'>

+ <var-decl name='st_mode' type-id='e1c52942' visibility='default'/>

+ </data-member>

+ <data-member access='public' layout-offset-in-bits='224'>

+ <var-decl name='st_uid' type-id='cc5fcceb' visibility='default'/>

+ </data-member>

+ <data-member access='public' layout-offset-in-bits='256'>

+ <var-decl name='st_gid' type-id='d94ec6d9' visibility='default'/>

+ </data-member>

+ <data-member access='public' layout-offset-in-bits='288'>

+ <var-decl name='__pad0' type-id='95e97e5e' visibility='default'/>

+ </data-member>

+ <data-member access='public' layout-offset-in-bits='320'>

+ <var-decl name='st_rdev' type-id='35ed8932' visibility='default'/>

+ </data-member>

+ <data-member access='public' layout-offset-in-bits='384'>

+ <var-decl name='st_size' type-id='79989e9c' visibility='default'/>

+ </data-member>

+ <data-member access='public' layout-offset-in-bits='448'>

+ <var-decl name='st_blksize' type-id='d3f10a7f' visibility='default'/>

+ </data-member>

+ <data-member access='public' layout-offset-in-bits='512'>

+ <var-decl name='st_blocks' type-id='4e711bf1' visibility='default'/>

+ </data-member>

+ <data-member access='public' layout-offset-in-bits='576'>

+ <var-decl name='st_atim' type-id='a9c79a1f' visibility='default'/>

+ </data-member>

+ <data-member access='public' layout-offset-in-bits='704'>

+ <var-decl name='st_mtim' type-id='a9c79a1f' visibility='default'/>

+ </data-member>

+ <data-member access='public' layout-offset-in-bits='832'>

+ <var-decl name='st_ctim' type-id='a9c79a1f' visibility='default'/>

+ </data-member>

+ <data-member access='public' layout-offset-in-bits='960'>

+ <var-decl name='__glibc_reserved' type-id='083f8d58' visibility='default'/>

+ </data-member>

+ </class-decl>

+ <typedef-decl name='__dev_t' type-id='7359adad' id='35ed8932'/>

+ <typedef-decl name='__uid_t' type-id='f0981eeb' id='cc5fcceb'/>

+ <typedef-decl name='__gid_t' type-id='f0981eeb' id='d94ec6d9'/>

+ <typedef-decl name='__ino64_t' type-id='7359adad' id='71288a47'/>

+ <typedef-decl name='__nlink_t' type-id='7359adad' id='80f0b9df'/>

+ <typedef-decl name='__off_t' type-id='bd54fe1a' id='79989e9c'/>

+ <typedef-decl name='__off64_t' type-id='bd54fe1a' id='724e4de6'/>

+ <typedef-decl name='__time_t' type-id='bd54fe1a' id='65eda9c0'/>

+ <typedef-decl name='__blksize_t' type-id='bd54fe1a' id='d3f10a7f'/>

+ <typedef-decl name='__blkcnt64_t' type-id='bd54fe1a' id='4e711bf1'/>

+ <typedef-decl name='__syscall_slong_t' type-id='bd54fe1a' id='03085adc'/>

+ <typedef-decl name='FILE' type-id='ec1ed955' id='aa12d1ba'/>

<class-decl name='timespec' size-in-bits='128' is-struct='yes' visibility='default' id='a9c79a1f'>

<data-member access='public' layout-offset-in-bits='0'>

<var-decl name='tv_sec' type-id='65eda9c0' visibility='default'/>

@@ -1049,16 +1059,11 @@

</class-decl>

<pointer-type-def type-id='aa12d1ba' size-in-bits='64' id='822cd80b'/>

<pointer-type-def type-id='ec1ed955' size-in-bits='64' id='dca988a5'/>

- <pointer-type-def type-id='a4036571' size-in-bits='64' id='570f8c59'/>

<pointer-type-def type-id='bb4788fa' size-in-bits='64' id='cecf4ea7'/>

<pointer-type-def type-id='010ae0b9' size-in-bits='64' id='e4c6fa61'/>

- <pointer-type-def type-id='79bd3751' size-in-bits='64' id='c65a1f29'/>

<pointer-type-def type-id='0c544dc0' size-in-bits='64' id='394fc496'/>

<pointer-type-def type-id='1b055409' size-in-bits='64' id='9d424d31'/>

<pointer-type-def type-id='0bbec9cd' size-in-bits='64' id='62f7a03d'/>

- <class-decl name='_IO_codecvt' is-struct='yes' visibility='default' is-declaration-only='yes' id='a4036571'/>

- <class-decl name='_IO_marker' is-struct='yes' visibility='default' is-declaration-only='yes' id='010ae0b9'/>

- <class-decl name='_IO_wide_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='79bd3751'/>

<function-decl name='getmntany' mangled-name='getmntany' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getmntany'>

@@ -1114,7 +1119,6 @@

<type-decl name='char' size-in-bits='8' id='a84c031d'/>

<type-decl name='unsigned long int' size-in-bits='64' id='7359adad'/>

<type-decl name='variadic parameter type' id='2c1145c5'/>

- <type-decl name='void' id='48b5725f'/>

<typedef-decl name='size_t' type-id='7359adad' id='b59d7dce'/>

<pointer-type-def type-id='a84c031d' size-in-bits='64' id='26a90f95'/>

<qualified-type-def type-id='a84c031d' const='yes' id='9b45d938'/>

@@ -1147,6 +1151,7 @@

</function-decl>

+ <type-decl name='void' id='48b5725f'/>

</abi-instr>

<abi-instr address-size='64' path='uu_avl.c' language='LANG_C99'>

<array-type-def dimensions='1' type-id='bf311473' size-in-bits='128' id='f0f65199'>

@@ -1299,6 +1304,15 @@

<typedef-decl name='int8_t' type-id='2171a512' id='ee31ee44'/>

<typedef-decl name='uint8_t' type-id='c51d6389' id='b96825af'/>

<typedef-decl name='uint32_t' type-id='62f1140c' id='8f92235e'/>

+ <class-decl name='__pthread_internal_list' size-in-bits='128' is-struct='yes' visibility='default' id='0e01899c'>

+ <data-member access='public' layout-offset-in-bits='0'>

+ <var-decl name='__prev' type-id='4d98cd5a' visibility='default'/>

+ </data-member>

+ <data-member access='public' layout-offset-in-bits='64'>

+ <var-decl name='__next' type-id='4d98cd5a' visibility='default'/>

+ </data-member>

+ </class-decl>

+ <typedef-decl name='__pthread_list_t' type-id='0e01899c' id='518fb49c'/>

<class-decl name='__pthread_mutex_s' size-in-bits='320' is-struct='yes' visibility='default' id='4c734837'>

<data-member access='public' layout-offset-in-bits='0'>

<var-decl name='__lock' type-id='95e97e5e' visibility='default'/>

@@ -1325,15 +1339,6 @@

<var-decl name='__list' type-id='518fb49c' visibility='default'/>

</data-member>

</class-decl>

- <class-decl name='__pthread_internal_list' size-in-bits='128' is-struct='yes' visibility='default' id='0e01899c'>

- <data-member access='public' layout-offset-in-bits='0'>

- <var-decl name='__prev' type-id='4d98cd5a' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='64'>

- <var-decl name='__next' type-id='4d98cd5a' visibility='default'/>

- </data-member>

- </class-decl>

- <typedef-decl name='__pthread_list_t' type-id='0e01899c' id='518fb49c'/>

<typedef-decl name='__int8_t' type-id='28577a57' id='2171a512'/>

<typedef-decl name='__uint8_t' type-id='002ac4a6' id='c51d6389'/>

<typedef-decl name='__uint32_t' type-id='f0981eeb' id='62f1140c'/>

diff --git a/lib/libzfs/libzfs.abi b/lib/libzfs/libzfs.abi
index 8a696206a56f..9bd1fd0db0e9 100644
--- a/lib/libzfs/libzfs.abi
+++ b/lib/libzfs/libzfs.abi

@@ -10,11 +10,14 @@

+ <dependency name='libdl.so.2'/>

</elf-needed>

<elf-function-symbols>

+ <elf-symbol name='_fini' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>

+ <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>

<elf-symbol name='_sol_getmntent' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>

<elf-symbol name='atomic_add_16' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>

<elf-symbol name='atomic_add_16_nv' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>

@@ -1398,9 +1401,6 @@

<array-type-def dimensions='1' type-id='a84c031d' size-in-bits='160' id='664ac0b7'>

</array-type-def>

- <class-decl name='_IO_codecvt' is-struct='yes' visibility='default' is-declaration-only='yes' id='a4036571'/>

- <class-decl name='_IO_marker' is-struct='yes' visibility='default' is-declaration-only='yes' id='010ae0b9'/>

- <class-decl name='_IO_wide_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='79bd3751'/>

<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'/>

@@ -1421,66 +1421,18 @@

<var-decl name='mnt_minor' type-id='3502e3ff' visibility='default'/>

</data-member>

</class-decl>

- <class-decl name='stat64' size-in-bits='1152' is-struct='yes' visibility='default' id='0bbec9cd'>

+ <typedef-decl name='_IO_lock_t' type-id='48b5725f' id='bb4788fa'/>

+ <class-decl name='_IO_marker' size-in-bits='192' is-struct='yes' visibility='default' id='010ae0b9'>

<data-member access='public' layout-offset-in-bits='0'>

- <var-decl name='st_dev' type-id='35ed8932' visibility='default'/>

+ <var-decl name='_next' type-id='e4c6fa61' visibility='default'/>

</data-member>

<data-member access='public' layout-offset-in-bits='64'>

- <var-decl name='st_ino' type-id='71288a47' visibility='default'/>

+ <var-decl name='_sbuf' type-id='dca988a5' visibility='default'/>

</data-member>

<data-member access='public' layout-offset-in-bits='128'>

- <var-decl name='st_nlink' type-id='80f0b9df' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='192'>

- <var-decl name='st_mode' type-id='e1c52942' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='224'>

- <var-decl name='st_uid' type-id='cc5fcceb' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='256'>

- <var-decl name='st_gid' type-id='d94ec6d9' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='288'>

- <var-decl name='__pad0' type-id='95e97e5e' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='320'>

- <var-decl name='st_rdev' type-id='35ed8932' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='384'>

- <var-decl name='st_size' type-id='79989e9c' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='448'>

- <var-decl name='st_blksize' type-id='d3f10a7f' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='512'>

- <var-decl name='st_blocks' type-id='4e711bf1' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='576'>

- <var-decl name='st_atim' type-id='a9c79a1f' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='704'>

- <var-decl name='st_mtim' type-id='a9c79a1f' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='832'>

- <var-decl name='st_ctim' type-id='a9c79a1f' visibility='default'/>

- </data-member>

- <data-member access='public' layout-offset-in-bits='960'>

- <var-decl name='__glibc_reserved' type-id='083f8d58' visibility='default'/>

+ <var-decl name='_pos' type-id='95e97e5e' visibility='default'/>

</data-member>

</class-decl>

- <typedef-decl name='__dev_t' type-id='7359adad' id='35ed8932'/>

- <typedef-decl name='__gid_t' type-id='f0981eeb' id='d94ec6d9'/>

- <typedef-decl name='__ino64_t' type-id='7359adad' id='71288a47'/>

- <typedef-decl name='__mode_t' type-id='f0981eeb' id='e1c52942'/>