Implement -A (ignore ASSERTs) for zdb

The command line switch -A (ignore ASSERTs) has always been available in zdb but was never connected up to the correct global variable. There are times when you need zdb to ignore asserts and keep dumping out whatever information it can get despite the ASSERT(s) failing. It was always intended to be part of zdb but was incomplete. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Paul Zuchowski <[email protected]> Closes #9610
openzfs · Nov 27, 2019 · 7c1bf0c · 7c1bf0c
1 parent 9e17e6f
commit 7c1bf0c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/libspl/include/assert.h b/lib/libspl/include/assert.h
@@ -33,11 +33,18 @@
 #include <stdlib.h>
 #include <stdarg.h>
 
+#ifndef _KERNEL
+int aok;
+#endif
+
 static inline int
 libspl_assert(const char *buf, const char *file, const char *func, int line)
 {
 	fprintf(stderr, "%s\n", buf);
 	fprintf(stderr, "ASSERT at %s:%d:%s()", file, line, func);
+	if (aok) {
+		return (0);
+	}
 	abort();
 }
 
@@ -52,6 +59,9 @@ libspl_assertf(const char *file, const char *func, int line, char *format, ...)
 	fprintf(stderr, "\n");
 	fprintf(stderr, "ASSERT at %s:%d:%s()", file, line, func);
 	va_end(args);
+	if (aok) {
+		return;
+	}
 	abort();
 }
 

diff --git a/lib/libzpool/kernel.c b/lib/libzpool/kernel.c
@@ -47,7 +47,6 @@
  * Emulation of kernel services in userland.
  */
 
-int aok;
 uint64_t physmem;
 char hw_serial[HW_HOSTID_LEN];
 struct utsname hw_utsname;