Date: Thu, 25 Jun 2015 08:11:39 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r284805 - stable/10/cddl/contrib/opensolaris/lib/libzfs/common Message-ID: <201506250811.t5P8Bdq8021467@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Thu Jun 25 08:11:39 2015 New Revision: 284805 URL: https://svnweb.freebsd.org/changeset/base/284805 Log: MFC r284308: MFV r284042: 1778 Assertion failed: rn->rn_nozpool == B_FALSE Modified: stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Directory Properties: stable/10/ (props changed) Modified: stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c ============================================================================== --- stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Thu Jun 25 08:10:23 2015 (r284804) +++ stable/10/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Thu Jun 25 08:11:39 2015 (r284805) @@ -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); - } } /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506250811.t5P8Bdq8021467>