From a9a2bf71520ffb5668c9204db5c7df0445dc912a Mon Sep 17 00:00:00 2001 From: David Quigley Date: Mon, 18 Sep 2017 18:06:40 -0600 Subject: 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 Signed-off-by: David Quigley Closes #6641 --- include/libzfs_impl.h | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'include/libzfs_impl.h') 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 #include -#if defined(HAVE_LIBTOPO) -#include -#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 -- cgit v1.2.3