libspl: staticify buf and pagesize, rename aok to libspl_assert_ok

Exporting names this short can easily cause nasty collisions with user code. Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: John Kennedy <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes #12050
openzfs · Jun 3, 2021 · 94f942c · 94f942c
1 parent f97142c
commit 94f942c
Show file tree

Hide file tree

Showing 9 changed files with 7,903 additions and 4,662 deletions.
diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
@@ -8496,7 +8496,7 @@ main(int argc, char **argv)
 			dump_opt[c] += verbose;
 	}
 
-	aok = (dump_opt['A'] == 1) || (dump_opt['A'] > 2);
+	libspl_assert_ok = (dump_opt['A'] == 1) || (dump_opt['A'] > 2);
 	zfs_recover = (dump_opt['A'] > 1);
 
 	argc -= optind;

diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h
@@ -160,8 +160,6 @@ extern void vpanic(const char *, va_list)  __NORETURN;
 
 #define	fm_panic	panic
 
-extern int aok;
-
 /*
  * DTrace SDT probes have different signatures in userland than they do in
  * the kernel.  If they're being used in kernel code, re-define them out of

diff --git a/lib/libnvpair/libnvpair.abi b/lib/libnvpair/libnvpair.abi
diff --git a/lib/libspl/assert.c b/lib/libspl/assert.c
@@ -25,7 +25,7 @@
 
 #include <assert.h>
 
-int aok = 0;
+int libspl_assert_ok = 0;
 
 /* printf version of libspl_assert */
 void
@@ -39,7 +39,7 @@ libspl_assertf(const char *file, const char *func, int line,
 	fprintf(stderr, "\n");
 	fprintf(stderr, "ASSERT at %s:%d:%s()", file, line, func);
 	va_end(args);
-	if (aok) {
+	if (libspl_assert_ok) {
 		return;
 	}
 	abort();

diff --git a/lib/libspl/include/assert.h b/lib/libspl/include/assert.h
@@ -34,7 +34,7 @@
 #include <stdarg.h>
 
 /* Set to non-zero to avoid abort()ing on an assertion failure */
-extern int aok;
+extern int libspl_assert_ok;
 
 /* printf version of libspl_assert */
 extern void libspl_assertf(const char *file, const char *func, int line,

diff --git a/lib/libspl/os/linux/getmntany.c b/lib/libspl/os/linux/getmntany.c
@@ -41,7 +41,7 @@
 
 #define	BUFSIZE	(MNT_LINE_MAX + 2)
 
-__thread char buf[BUFSIZE];
+static __thread char buf[BUFSIZE];
 
 #define	DIFF(xx)	( \
 	    (mrefp->xx != NULL) && \

diff --git a/lib/libspl/page.c b/lib/libspl/page.c
@@ -22,7 +22,7 @@
 
 #include <unistd.h>
 
-size_t pagesize = 0;
+static size_t pagesize = 0;
 
 size_t
 spl_pagesize(void)

diff --git a/lib/libuutil/libuutil.abi b/lib/libuutil/libuutil.abi
diff --git a/lib/libzfs_core/libzfs_core.abi b/lib/libzfs_core/libzfs_core.abi