Add linux topology support

Solaris recently introduced the idea of drive topology because
where a drive is located does matter.  I have already handled
this with udev/blkid integration under Linux so I'm hopeful
this case can simply be removed but for now I've just stubbed
out what is needed in libspl and commented out the rest here.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

diff --git a/lib/libzfs/include/libzfs_impl.h b/lib/libzfs/include/libzfs_impl.h
index c9b09a2050249916de0947bb81567cb81d0830e4..3d001df076b1ea7f99716ed01f337e30b0406de9 100644 (file)
--- a/lib/libzfs/include/libzfs_impl.h
+++ b/lib/libzfs/include/libzfs_impl.h
@@ -36,7 +36,9 @@
 #include <libzfs.h>
 #include <libshare.h>
 
+#if defined(HAVE_LIBTOPO)
 #include <fm/libtopo.h>
+#endif /* HAVE_LIBTOPO */
 
 #ifdef __cplusplus
 extern "C" {
@@ -74,9 +76,11 @@ 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];
 };
 

diff --git a/lib/libzfs/libzfs_fru.c b/lib/libzfs/libzfs_fru.c
index 788fa2cfb763de47952089676b3422b5477737df..78f2f9c371aea15d59ec5cfbf31154a852a3d704 100644 (file)
--- a/lib/libzfs/libzfs_fru.c
+++ b/lib/libzfs/libzfs_fru.c
@@ -34,6 +34,8 @@
 
 #include <libzfs.h>
 
+#if defined(HAVE_LIBTOPO)
+
 #include <fm/libtopo.h>
 #include <sys/fm/protocol.h>
 #include <sys/systeminfo.h>
@@ -450,3 +452,18 @@ libzfs_fru_clear(libzfs_handle_t *hdl, boolean_t final)
                    ZFS_FRU_HASH_SIZE * sizeof (void *));
        }
 }
+
+#else /* HAVE_LIBTOPO */
+
+/*
+ * Clear memory associated with the FRU hash.
+ */
+void
+libzfs_fru_clear(libzfs_handle_t *hdl, boolean_t final)
+{
+       return;
+}
+
+#endif /* HAVE_LIBTOPO */
+
+