diff options
| author | Andriy Gapon <avg@FreeBSD.org> | 2013-11-20 10:54:06 +0000 |
|---|---|---|
| committer | Andriy Gapon <avg@FreeBSD.org> | 2013-11-20 10:54:06 +0000 |
| commit | a1d7a45c43aec85ccdf658ee53c9652d32c790eb (patch) | |
| tree | 156986ec2bfd5cbbb534a4950b94bd01021f9f3d /lib | |
| parent | aad25bd4159c3323f76a7a9fbc11aeea011a40c4 (diff) | |
Notes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libzfs/common/libzfs_pool.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/libzfs/common/libzfs_pool.c b/lib/libzfs/common/libzfs_pool.c index 55e102211819c..3fac8c3b93042 100644 --- a/lib/libzfs/common/libzfs_pool.c +++ b/lib/libzfs/common/libzfs_pool.c @@ -22,7 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. */ @@ -413,10 +413,9 @@ zpool_valid_proplist(libzfs_handle_t *hdl, const char *poolname, prop = zpool_name_to_prop(propname); if (prop == ZPROP_INVAL && zpool_prop_feature(propname)) { int err; - zfeature_info_t *feature; char *fname = strchr(propname, '@') + 1; - err = zfeature_lookup_name(fname, &feature); + err = zfeature_lookup_name(fname, NULL); if (err != 0) { ASSERT3U(err, ==, ENOENT); zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, @@ -807,14 +806,14 @@ zpool_prop_get_feature(zpool_handle_t *zhp, const char *propname, char *buf, */ if (supported) { int ret; - zfeature_info_t *fi; + spa_feature_t fid; - ret = zfeature_lookup_name(feature, &fi); + ret = zfeature_lookup_name(feature, &fid); if (ret != 0) { (void) strlcpy(buf, "-", len); return (ENOTSUP); } - feature = fi->fi_guid; + feature = spa_feature_table[fid].fi_guid; } if (nvlist_lookup_uint64(features, feature, &refcount) == 0) |