svn commit: r284042 - vendor/illumos/dist/lib/libzfs/common

[Andriy Gapon]

Author: avg
Date: Fri Jun  5 17:26:07 2015
New Revision: 284042
URL: https://svnweb.freebsd.org/changeset/base/284042

Log:
  1778 Assertion failed: rn->rn_nozpool == B_FALSE, file ../common/libzfs_import.c, line 1077, function zpool_open_func
  
  Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  Reviewed by: George Wilson <george at delphix.com>
  Reviewed by: Richard Elling <richard.elling at richardelling.com>
  Approved by: Gordon Ross <gordon.ross at nexenta.com>
  Author: Andrew Stormont <andyjstormont at gmail.com>
  
  illumos/illumos-gate at bd0f709169e67f4bd34526e186a7c34f595f0d9b

Modified:
  vendor/illumos/dist/lib/libzfs/common/libzfs_import.c

Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_import.c
==============================================================================
--- vendor/illumos/dist/lib/libzfs/common/libzfs_import.c	Fri Jun  5 17:18:10 2015	(r284041)
+++ vendor/illumos/dist/lib/libzfs/common/libzfs_import.c	Fri Jun  5 17:26:07 2015	(r284042)
@@ -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.
  */
 
 /*
@@ -1079,11 +1080,7 @@ zpool_open_func(void *arg)
 	}
 	(void) close(fd);
 
-
 	rn->rn_config = config;
-	if (config != NULL) {
-		assert(rn->rn_nozpool == B_FALSE);
-	}
 }
 
 /*