Author: avg
Date: Fri Jun 12 11:16:43 2015
New Revision: 284308
URL: https://svnweb.freebsd.org/changeset/base/284308
Log:
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 <andyjstorm...@gmail.com>
MFC after: 13 days
Modified:
head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
Directory Properties:
head/cddl/contrib/opensolaris/ (props changed)
head/cddl/contrib/opensolaris/lib/libzfs/ (props changed)
Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Fri Jun
12 11:14:08 2015 (r284307)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Fri Jun
12 11:16:43 2015 (r284308)
@@ -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);
- }
}
/*
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
