diff options
| author | David Quigley <[email protected]> | 2017-09-18 18:06:40 -0600 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-09-18 17:06:40 -0700 |
| commit | a9a2bf71520ffb5668c9204db5c7df0445dc912a (patch) | |
| tree | e0f60e10e5ae4d751b6792e05de771037a91bc9b /include | |
| parent | ea49beba66106dcb272b43323fad147df1df13fd (diff) | |
Remove FRU and LIBTOPO Support
FRU and LIBTOPO support are illumos only features that will not be ported to
Linux and make the code more complicated than necessary. This commit
makes way for further cleanups of the zed/FMA code.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: David Quigley <[email protected]>
Closes #6641
Diffstat (limited to 'include')
| -rw-r--r-- | include/libzfs.h | 11 | ||||
| -rw-r--r-- | include/libzfs_impl.h | 18 |
2 files changed, 0 insertions, 29 deletions
diff --git a/include/libzfs.h b/include/libzfs.h index df8d738b7..ac5a30c35 100644 --- a/include/libzfs.h +++ b/include/libzfs.h @@ -873,17 +873,6 @@ extern int zpool_enable_datasets(zpool_handle_t *, const char *, int); extern int zpool_disable_datasets(zpool_handle_t *, boolean_t); /* - * Mappings between vdev and FRU. - */ -extern void libzfs_fru_refresh(libzfs_handle_t *); -extern const char *libzfs_fru_lookup(libzfs_handle_t *, const char *); -extern const char *libzfs_fru_devpath(libzfs_handle_t *, const char *); -extern boolean_t libzfs_fru_compare(libzfs_handle_t *, const char *, - const char *); -extern boolean_t libzfs_fru_notself(libzfs_handle_t *, const char *); -extern int zpool_fru_set(zpool_handle_t *, uint64_t, const char *); - -/* * Support for Linux libudev derived persistent device strings */ extern boolean_t is_mpath_whole_disk(const char *); diff --git a/include/libzfs_impl.h b/include/libzfs_impl.h index 2efd85e31..8107ed48b 100644 --- a/include/libzfs_impl.h +++ b/include/libzfs_impl.h @@ -38,21 +38,10 @@ #include <libshare.h> #include <libzfs_core.h> -#if defined(HAVE_LIBTOPO) -#include <fm/libtopo.h> -#endif /* HAVE_LIBTOPO */ - #ifdef __cplusplus extern "C" { #endif -typedef struct libzfs_fru { - char *zf_device; - char *zf_fru; - struct libzfs_fru *zf_chain; - struct libzfs_fru *zf_next; -} libzfs_fru_t; - struct libzfs_handle { int libzfs_error; int libzfs_fd; @@ -72,11 +61,6 @@ struct libzfs_handle { boolean_t libzfs_mnttab_enable; avl_tree_t libzfs_mnttab_cache; int libzfs_pool_iter; -#if defined(HAVE_LIBTOPO) - topo_hdl_t *libzfs_topo_hdl; - libzfs_fru_t **libzfs_fru_hash; - libzfs_fru_t *libzfs_fru_list; -#endif /* HAVE_LIBTOPO */ char libzfs_chassis_id[256]; }; @@ -208,8 +192,6 @@ extern int zfs_parse_options(char *, zfs_share_proto_t); extern int zfs_unshare_proto(zfs_handle_t *, const char *, zfs_share_proto_t *); -extern void libzfs_fru_clear(libzfs_handle_t *, boolean_t); - #ifdef __cplusplus } #endif |