Make sure avl_tree.avl_pad is not in kernel module

Signed-off-by: Youzhong Yang <[email protected]>
youzhongyang · Jun 18, 2024 · 9cfe048 · 9cfe048
1 parent c98295e
commit 9cfe048
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
@@ -147,7 +147,7 @@ struct avl_tree {
 	int (*avl_compar)(const void *, const void *);
 	size_t avl_offset;		/* offsetof(type, avl_link_t field) */
 	ulong_t avl_numnodes;		/* number of nodes in the tree */
-#ifndef _KERNEL
+#ifndef __KERNEL__
 	size_t avl_pad;			/* For backwards ABI compatibility. */
 #endif
 };

diff --git a/include/sys/spa.h b/include/sys/spa.h
@@ -35,11 +35,11 @@
 #ifndef _SYS_SPA_H
 #define	_SYS_SPA_H
 
+#include <sys/sysmacros.h>
 #include <sys/avl.h>
 #include <sys/zfs_context.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>