diff options
| author | Andrew Stormont <[email protected]> | 2016-01-20 16:37:10 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-01-22 16:18:26 -0800 |
| commit | ee42b3d6c3e4bd16d87b75e92a2bdec5cb85cd77 (patch) | |
| tree | 7d5d9547b395d504da7678a6a5e904e4c4fdb966 /lib | |
| parent | 0fdd8d6482661047e3fabea72e8168abd945a7ec (diff) | |
Illumos 1778 - Assertion failed: rn->rn_nozpool == B_FALSE
1778 Assertion failed: rn->rn_nozpool == B_FALSE
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: George Wilson <[email protected]>
Reviewed by: Richard Elling <[email protected]>
Approved by: Gordon Ross <[email protected]>
References:
https://www.illumos.org/issues/1778
https://github.com/illumos/illumos-gate/commit/bd0f709
Ported-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libzfs/libzfs_import.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c index a834c3ea9..d71f343a0 100644 --- a/lib/libzfs/libzfs_import.c +++ b/lib/libzfs/libzfs_import.c @@ -22,6 +22,7 @@ * Copyright 2015 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright 2015 RackTop Systems. */ /* @@ -1168,9 +1169,6 @@ zpool_open_func(void *arg) rn->rn_config = config; rn->rn_num_labels = num_labels; - if (config != NULL) { - assert(rn->rn_nozpool == B_FALSE); - } } /* |