libspl: declare aok extern in header

Rather than defining a new instance of 'aok' in every compilation unit which includes this header, there is a single instance defined in zone.c, and the header now only declares an extern. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Paul Zuchowski <pzuchowski@datto.com> Signed-off-by: Nick Black <dankamongmen@gmail.com> Closes #9752
openzfs · Jan 22, 2020 · 0d55a09 · 0d55a09
1 parent bb04f9c
commit 0d55a09
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/lib/libspl/include/assert.h b/lib/libspl/include/assert.h
@@ -34,7 +34,7 @@
 #include <stdarg.h>
 
 #ifndef _KERNEL
-int aok;
+extern int aok;
 #endif
 
 static inline int

diff --git a/lib/libspl/zone.c b/lib/libspl/zone.c
@@ -27,6 +27,8 @@
 #include <string.h>
 #include <errno.h>
 
+int aok = 0;
+
 zoneid_t
 getzoneid()
 {

diff --git a/tests/zfs-tests/tests/functional/checksum/edonr_test.c b/tests/zfs-tests/tests/functional/checksum/edonr_test.c
@@ -42,6 +42,8 @@
 typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
 typedef	unsigned long long	u_longlong_t;
 
+int aok = 0;
+
 /*
  * Test messages from:
  * http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/SHA_All.pdf