From 0c7b62a5234d9fb81150654e332608f4300cbb12 Mon Sep 17 00:00:00 2001 From: avg Date: Thu, 25 Jun 2015 08:11:39 +0000 Subject: [PATCH] MFC r284308: MFV r284042: 1778 Assertion failed: rn->rn_nozpool == B_FALSE git-svn-id: svn://svn.freebsd.org/base/stable/10@284805 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c | 5 +---- 1 file changed, 1 insertion(+), 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 0ca36d237..87b41cff7 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); - } } /* -- 2.45.0