Fix spl version check

[zfs.git] / lib / libzfs / include / libzfs.h

diff --git a/lib/libzfs/include/libzfs.h b/lib/libzfs/include/libzfs.h
index b0287ed..dcbd283 100644 (file)
--- a/lib/libzfs/include/libzfs.h
+++ b/lib/libzfs/include/libzfs.h
@@ -49,6 +49,26 @@ extern "C" {
 #define        ZPOOL_MAXPROPLEN        MAXPATHLEN
 
 /*
+ * Default device paths
+ */
+
+#if defined(__sun__) || defined(__sun)
+#define        DISK_ROOT       "/dev/dsk"
+#define        RDISK_ROOT      "/dev/rdsk"
+#define        UDISK_ROOT      RDISK_ROOT
+#define        FIRST_SLICE     "s0"
+#define        BACKUP_SLICE    "s2"
+#endif
+
+#ifdef __linux__
+#define        DISK_ROOT       "/dev"
+#define        RDISK_ROOT      DISK_ROOT
+#define        UDISK_ROOT      "/dev/disk"
+#define        FIRST_SLICE     "1"
+#define        BACKUP_SLICE    ""
+#endif
+
+/*
  * libzfs errors
  */
 enum {
@@ -248,6 +268,7 @@ extern nvlist_t *zpool_find_vdev(zpool_handle_t *, const char *, boolean_t *,
     boolean_t *, boolean_t *);
 extern nvlist_t *zpool_find_vdev_by_physpath(zpool_handle_t *, const char *,
     boolean_t *, boolean_t *, boolean_t *);
+extern int zpool_label_disk_wait(char *, int);
 extern int zpool_label_disk(libzfs_handle_t *, zpool_handle_t *, char *);
 
 /*
@@ -644,15 +665,6 @@ extern int zfs_deleg_share_nfs(libzfs_handle_t *, char *, char *, char *,
     void *, void *, int, zfs_share_op_t);
 
 /*
- * When dealing with nvlists, verify() is extremely useful
- */
-#ifdef NDEBUG
-#define        verify(EX)      ((void)(EX))
-#else
-#define        verify(EX)      assert(EX)
-#endif
-
-/*
  * Utility function to convert a number to a human-readable form.
  */
 extern void zfs_nicenum(uint64_t, char *, size_t);
@@ -670,9 +682,6 @@ extern int zpool_in_use(libzfs_handle_t *, int, pool_state_t *, char **,
 extern int zpool_read_label(int, nvlist_t **);
 extern int zpool_clear_label(int);
 
-/* is this zvol valid for use as a dump device? */
-extern int zvol_check_dump_config(char *);
-
 /*
  * Management interfaces for SMB ACL files
  */