diff options
| author | gjb <gjb@FreeBSD.org> | 2016-02-02 22:27:48 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2016-02-02 22:27:48 +0000 |
| commit | efd5551e55b056811a107b33e1c30676ee37d0e8 (patch) | |
| tree | 5ea64f05cc16d8a5032524fdefec823e707e1ff3 /cddl | |
| parent | a6998ad84f9722c560a80302a74fa495e818a153 (diff) | |
| parent | 6d511d769313fd1dae574a1d395369df219e86b6 (diff) | |
| download | FreeBSD-src-efd5551e55b056811a107b33e1c30676ee37d0e8.zip FreeBSD-src-efd5551e55b056811a107b33e1c30676ee37d0e8.tar.gz | |
MFH
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c index d5ba20f..c3dafd6 100644 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c @@ -26,6 +26,7 @@ /* * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2015 by Syneto S.R.L. All rights reserved. */ /* @@ -246,8 +247,9 @@ zpool_get_features(zpool_handle_t *zhp) config = zpool_get_config(zhp, NULL); } - verify(nvlist_lookup_nvlist(config, ZPOOL_CONFIG_FEATURE_STATS, - &features) == 0); + if (nvlist_lookup_nvlist(config, ZPOOL_CONFIG_FEATURE_STATS, + &features) != 0) + return (NULL); return (features); } |
