Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Make sure avl_tree.avl_pad is not in kernel module (#16280) 

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 <yyang@mathworks.com>
Co-authored-by: Youzhong Yang <yyang@mathworks.com>
Reviewed-by: Rob Norris <rob.norris@klarasystems.com>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Tino Reichardt <milky-zfs@mcmilk.de>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
This commit is contained in:
youzhongyang 2024-07-17 16:54:11 -04:00 committed by GitHub
parent dc91e74524
commit ab6d9bd89a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sys/avl_impl.h
View File

@ -34,6 +34,7 @@
*/ */
#include <sys/types.h> #include <sys/types.h>
#include <sys/sysmacros.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

3
include/sys/spa.h
View File

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