diff options
author | smh <smh@FreeBSD.org> | 2015-01-30 01:05:50 +0000 |
---|---|---|
committer | smh <smh@FreeBSD.org> | 2015-01-30 01:05:50 +0000 |
commit | e788b18c4ea45e5cde1a889b6afe1aedc0ea4dbd (patch) | |
tree | f5fdcab09163c2208c51b4a7db2eecdb0e3d3909 /cddl/contrib/opensolaris | |
parent | d9e79da5d76c1aa52189fa2c549b6f055373486b (diff) | |
download | FreeBSD-src-e788b18c4ea45e5cde1a889b6afe1aedc0ea4dbd.zip FreeBSD-src-e788b18c4ea45e5cde1a889b6afe1aedc0ea4dbd.tar.gz |
MFC r277239:
Eliminate illumos whole disk special case when searching for a ZFS vdev
Sponsored by: Multiplay
Diffstat (limited to 'cddl/contrib/opensolaris')
-rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c index 40535f8..b8f126c 100644 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c @@ -1916,6 +1916,7 @@ zpool_scan(zpool_handle_t *zhp, pool_scan_func_t func) } } +#ifdef illumos /* * This provides a very minimal check whether a given string is likely a * c#t#d# style string. Users of this are expected to do their own @@ -1947,6 +1948,7 @@ ctd_check_path(char *str) { } return (CTD_CHECK(str)); } +#endif /* * Find a vdev that matches the search criteria specified. We use the @@ -2002,6 +2004,7 @@ vdev_to_nvlist_iter(nvlist_t *nv, nvlist_t *search, boolean_t *avail_spare, * * Otherwise, all other searches are simple string compares. */ +#ifdef illumos if (strcmp(srchkey, ZPOOL_CONFIG_PATH) == 0 && ctd_check_path(val)) { uint64_t wholedisk = 0; @@ -2041,6 +2044,9 @@ vdev_to_nvlist_iter(nvlist_t *nv, nvlist_t *search, boolean_t *avail_spare, break; } } else if (strcmp(srchkey, ZPOOL_CONFIG_TYPE) == 0 && val) { +#else + if (strcmp(srchkey, ZPOOL_CONFIG_TYPE) == 0 && val) { +#endif char *type, *idx, *end, *p; uint64_t id, vdev_id; |