diff options
Diffstat (limited to 'include/libzfs.h')
| -rw-r--r-- | include/libzfs.h | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/include/libzfs.h b/include/libzfs.h index 75e149334..e59350c9d 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. |