summaryrefslogtreecommitdiffstats
path: root/cddl/contrib
diff options
context:
space:
mode:
authoravg <avg@FreeBSD.org>2015-06-12 11:16:43 +0000
committeravg <avg@FreeBSD.org>2015-06-12 11:16:43 +0000
commit18e52c031c82b935c288884be293bee93d904d34 (patch)
tree16ff60d43a81023c786beda4008b9d148feeea97 /cddl/contrib
parent635065f17b3a7fd9f6dd7b56b68826666b2cc687 (diff)
downloadFreeBSD-src-18e52c031c82b935c288884be293bee93d904d34.zip
FreeBSD-src-18e52c031c82b935c288884be293bee93d904d34.tar.gz
MFV r284042: 1778 Assertion failed: rn->rn_nozpool == B_FALSE, file
../common/libzfs_import.c, line 1077, function zpool_open_func illumos/illumos-gate@bd0f709169e67f4bd34526e186a7c34f595f0d9b Author: Andrew Stormont <andyjstormont@gmail.com> MFC after: 13 days
Diffstat (limited to 'cddl/contrib')
-rw-r--r--cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
index c4e9ada..0987024 100644
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
@@ -23,6 +23,7 @@
* Copyright 2015 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright 2015 RackTop Systems.
*/
/*
@@ -1094,11 +1095,7 @@ zpool_open_func(void *arg)
}
(void) close(fd);
-
rn->rn_config = config;
- if (config != NULL) {
- assert(rn->rn_nozpool == B_FALSE);
- }
}
/*
OpenPOWER on IntegriCloud