Date: Thu, 25 Jun 2015 08:10:24 +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-9@freebsd.org Subject: svn commit: r284804 - in stable/9: cddl/contrib/opensolaris/lib/libzfs/common sys/conf Message-ID: <201506250810.t5P8AOcU018286@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Thu Jun 25 08:10:23 2015 New Revision: 284804 URL: https://svnweb.freebsd.org/changeset/base/284804 Log: MFC r284308: MFV r284042: 1778 Assertion failed: rn->rn_nozpool == B_FALSE Modified: stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c stable/9/sys/conf/kern.mk Directory Properties: stable/9/cddl/contrib/opensolaris/lib/libzfs/ (props changed) Modified: stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c ============================================================================== --- stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Thu Jun 25 07:52:51 2015 (r284803) +++ stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c Thu Jun 25 08:10:23 2015 (r284804) @@ -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) 2012 by Delphix. All rights reserved. + * Copyright 2015 RackTop Systems. */ /* @@ -1090,11 +1091,7 @@ zpool_open_func(void *arg) } (void) close(fd); - rn->rn_config = config; - if (config != NULL) { - assert(rn->rn_nozpool == B_FALSE); - } } /* Modified: stable/9/sys/conf/kern.mk ============================================================================== --- stable/9/sys/conf/kern.mk Thu Jun 25 07:52:51 2015 (r284803) +++ stable/9/sys/conf/kern.mk Thu Jun 25 08:10:23 2015 (r284804) @@ -5,7 +5,7 @@ # CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ - -Wundef -Wno-pointer-sign -fformat-extensions \ + -Wundef -Wno-pointer-sign \ -Wmissing-include-dirs -fdiagnostics-show-option \ ${CWARNEXTRA} MK_CLANG_IS_CC ?= no
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506250810.t5P8AOcU018286>