Mercurial > illumos > illumos-gate

changeset 7043:22affca31e0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6719384 nvlist_lookup_uint64(config, "pool_guid", &this_guid) == 0, file ../common/libzfs_import.c,
author ck153898
date Mon, 07 Jul 2008 10:38:33 -0700
parents 46fc4b6db23e
children 33050d853d04
files usr/src/lib/libzfs/common/libzfs_import.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/lib/libzfs/common/libzfs_import.c	Mon Jul 07 10:11:14 2008 -0700
+++ b/usr/src/lib/libzfs/common/libzfs_import.c	Mon Jul 07 10:38:33 2008 -0700
@@ -895,10 +895,11 @@
 					    strcmp(poolname, pname) == 0;
 				} else if (guid != 0) {
 					uint64_t this_guid;
-					verify(nvlist_lookup_uint64(config,
+
+					matched = nvlist_lookup_uint64(config,
 					    ZPOOL_CONFIG_POOL_GUID,
-					    &this_guid) == 0);
-					matched = guid == this_guid;
+					    &this_guid) == 0 &&
+					    guid == this_guid;
 				}
 				if (!matched) {
 					nvlist_free(config);