vendor/illumos/20100818

1 files changed, 0 insertions, 83 deletions

diff --git a/lib/libzfs/common/libzfs_config.c b/lib/libzfs/common/libzfs_config.c
index d5ba20fde0cf..dc27238c9cf3 100644
--- a/lib/libzfs/common/libzfs_config.c
+++ b/lib/libzfs/common/libzfs_config.c
@@ -18,17 +18,12 @@
  *
  * CDDL HEADER END
  */
-
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 /*
- * Copyright (c) 2012 by Delphix. All rights reserved.
- */
-
-/*
  * The pool configuration repository is stored in /etc/zfs/zpool.cache as a
  * single packed nvlist.  While it would be nice to just read in this
  * file from userland, this wouldn't work from a local zone.  So we have to have
@@ -223,36 +218,6 @@ zpool_get_config(zpool_handle_t *zhp, nvlist_t **oldconfig)
 }
 
 /*
- * Retrieves a list of enabled features and their refcounts and caches it in
- * the pool handle.
- */
-nvlist_t *
-zpool_get_features(zpool_handle_t *zhp)
-{
-	nvlist_t *config, *features;
-
-	config = zpool_get_config(zhp, NULL);
-
-	if (config == NULL || !nvlist_exists(config,
-	    ZPOOL_CONFIG_FEATURE_STATS)) {
-		int error;
-		boolean_t missing = B_FALSE;
-
-		error = zpool_refresh_stats(zhp, &missing);
-
-		if (error != 0 || missing)
-			return (NULL);
-
-		config = zpool_get_config(zhp, NULL);
-	}
-
-	verify(nvlist_lookup_nvlist(config, ZPOOL_CONFIG_FEATURE_STATS,
-	    &features) == 0);
-
-	return (features);
-}
-
-/*
  * Refresh the vdev statistics associated with the given pool.  This is used in
  * iostat to show configuration changes and determine the delta from the last
  * time the function was called.  This function can fail, in case the pool has
@@ -337,48 +302,6 @@ zpool_refresh_stats(zpool_handle_t *zhp, boolean_t *missing)
 }
 
 /*
- * If the __ZFS_POOL_RESTRICT environment variable is set we only iterate over
- * pools it lists.
- *
- * This is an undocumented feature for use during testing only.
- *
- * This function returns B_TRUE if the pool should be skipped
- * during iteration.
- */
-static boolean_t
-check_restricted(const char *poolname)
-{
-	static boolean_t initialized = B_FALSE;
-	static char *restricted = NULL;
-
-	const char *cur, *end;
-	int len, namelen;
-
-	if (!initialized) {
-		initialized = B_TRUE;
-		restricted = getenv("__ZFS_POOL_RESTRICT");
-	}
-
-	if (NULL == restricted)
-		return (B_FALSE);
-
-	cur = restricted;
-	namelen = strlen(poolname);
-	do {
-		end = strchr(cur, ' ');
-		len = (NULL == end) ? strlen(cur) : (end - cur);
-
-		if (len == namelen && 0 == strncmp(cur, poolname, len)) {
-			return (B_FALSE);
-		}
-
-		cur += (len + 1);
-	} while (NULL != end);
-
-	return (B_TRUE);
-}
-
-/*
  * Iterate over all pools in the system.
  */
 int
@@ -401,9 +324,6 @@ zpool_iter(libzfs_handle_t *hdl, zpool_iter_f func, void *data)
 	for (cn = uu_avl_first(hdl->libzfs_ns_avl); cn != NULL;
 	    cn = uu_avl_next(hdl->libzfs_ns_avl, cn)) {
 
-		if (check_restricted(cn->cn_name))
-			continue;
-
 		if (zpool_open_silent(hdl, cn->cn_name, &zhp) != 0) {
 			hdl->libzfs_pool_iter--;
 			return (-1);
@@ -439,9 +359,6 @@ zfs_iter_root(libzfs_handle_t *hdl, zfs_iter_f func, void *data)
 	for (cn = uu_avl_first(hdl->libzfs_ns_avl); cn != NULL;
 	    cn = uu_avl_next(hdl->libzfs_ns_avl, cn)) {
 
-		if (check_restricted(cn->cn_name))
-			continue;
-
 		if ((zhp = make_dataset_handle(hdl, cn->cn_name)) == NULL)
 			continue;