svn commit: r324587 - stable/10/cddl/contrib/opensolaris/lib/libzpool/common

Andriy Gapon avg at FreeBSD.org
Fri Oct 13 09:11:25 UTC 2017


Author: avg
Date: Fri Oct 13 09:11:24 2017
New Revision: 324587
URL: https://svnweb.freebsd.org/changeset/base/324587

Log:
  MFC r323528: MFV r323527: 5815 libzpool's panic function doesn't set global panicstr

Modified:
  stable/10/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
==============================================================================
--- stable/10/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c	Fri Oct 13 09:10:37 2017	(r324586)
+++ stable/10/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c	Fri Oct 13 09:11:24 2017	(r324587)
@@ -727,11 +727,9 @@ static char ce_suffix[CE_IGNORE][2] = { "", "\n", "\n"
 void
 vpanic(const char *fmt, va_list adx)
 {
-	(void) fprintf(stderr, "error: ");
-	(void) vfprintf(stderr, fmt, adx);
-	(void) fprintf(stderr, "\n");
-
-	abort();	/* think of it as a "user-level crash dump" */
+	char buf[512];
+	(void) vsnprintf(buf, 512, fmt, adx);
+	assfail(buf, NULL, 0);
 }
 
 void


More information about the svn-src-stable mailing list