From b1fbc4db719e71e438f06caf86464a2310e4fadf Mon Sep 17 00:00:00 2001 From: avg Date: Thu, 25 Jun 2015 08:10:23 +0000 Subject: [PATCH] MFC r284308: MFV r284042: 1778 Assertion failed: rn->rn_nozpool == B_FALSE git-svn-id: svn://svn.freebsd.org/base/stable/9@284804 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c | 5 +---- sys/conf/kern.mk | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c index f897b2f79..6009f0220 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) 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); - } } /* diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 7947c40cc..998298a10 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -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 -- 2.45.0