Make sure avl_tree.avl_pad is not in kernel module

The commit b192a2c (Remove avl_size field from struct avl_tree) uses a def _KERNEL to decide to include avl_pad or not, but this _KERNEL is defined in sys/sysmacros.h. If avl.h and sysmacros.h are not included in the right order, it can cause a headache when working on a zfs related kernel module. Add sysmacros.h in avl_impl.h to fix. sysmacros.h is also removed from spa.h as it's reduntant. Signed-off-by: Youzhong Yang <[email protected]>
openzfs · Jul 17, 2024 · 1176fd4 · 1176fd4
1 parent 41902c8
commit 1176fd4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/include/sys/avl_impl.h b/include/sys/avl_impl.h
@@ -34,6 +34,7 @@
  */
 
 #include <sys/types.h>
+#include <sys/sysmacros.h>
 
 #ifdef	__cplusplus
 extern "C" {

diff --git a/include/sys/spa.h b/include/sys/spa.h
@@ -35,11 +35,10 @@
 #ifndef _SYS_SPA_H
 #define	_SYS_SPA_H
 
-#include <sys/avl.h>
 #include <sys/zfs_context.h>
+#include <sys/avl.h>
 #include <sys/kstat.h>
 #include <sys/nvpair.h>
-#include <sys/sysmacros.h>
 #include <sys/types.h>
 #include <sys/fs/zfs.h>
 #include <sys/spa_checksum.h>