diff options
| author | avg <avg@FreeBSD.org> | 2015-06-25 08:11:39 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2015-06-25 08:11:39 +0000 |
| commit | 91e9d26e116c48b2b63d0153154f28797795a07f (patch) | |
| tree | 3436f31d70ead0352d21659616303a88763e725b /cddl | |
| parent | d99396f96d0930930792ea497bcf9a7c18253871 (diff) | |
| download | FreeBSD-src-91e9d26e116c48b2b63d0153154f28797795a07f.zip FreeBSD-src-91e9d26e116c48b2b63d0153154f28797795a07f.tar.gz | |
MFC r284308: MFV r284042: 1778 Assertion failed: rn->rn_nozpool == B_FALSE
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c | 5 |
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 0ca36d2..87b41cf 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); - } } /* |
