X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=include%2Flibzfs.h;h=e59350c9dbdd8829422173ebd0b95ddf3644d473;hb=72938d6905d9dcd60f7a5ff68ae469e74c248228;hp=75e149334a65fa52c838a332a115bb77209088e6;hpb=37abac6d559a1da8ab8e5379442f491b73998f6a;p=zfs.git

diff --git a/include/libzfs.h b/include/libzfs.h
index 75e1493..e59350c 100644
--- a/include/libzfs.h
+++ b/include/libzfs.h
@@ -54,22 +54,11 @@ extern "C" {
 /*
  * Default device paths
  */
+#define	DISK_ROOT		"/dev"
+#define	UDISK_ROOT		"/dev/disk"
 
-#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
+#define	DEFAULT_IMPORT_PATH_SIZE	8
+extern char *zpool_default_import_path[DEFAULT_IMPORT_PATH_SIZE];
 
 /*
  * libzfs errors
@@ -658,8 +647,9 @@ extern zfs_handle_t *zfs_path_to_zhandle(libzfs_handle_t *, char *, zfs_type_t);
 extern boolean_t zfs_dataset_exists(libzfs_handle_t *, const char *,
     zfs_type_t);
 extern int zfs_spa_version(zfs_handle_t *, int *);
-extern void zfs_append_partition(const char *path, char *buf, size_t buflen);
+extern int zfs_append_partition(char *path, size_t max_len);
 extern int zfs_resolve_shortname(const char *name, char *path, size_t pathlen);
+extern int zfs_strcmp_pathname(char *name, char *cmp_name, int wholedisk);
 
 /*
  * Mount support functions.