From 37d5df62e01ef3a12e712b80bd47057136dfd634 Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Sun, 26 Oct 2025 15:01:21 +1100 Subject: [PATCH] libzpool: move ZFS-specific headers from libspl Sponsored-by: https://despairlabs.com/sponsor/ Reviewed-by: Brian Behlendorf Signed-off-by: Rob Norris Closes #17861 --- lib/libspl/include/Makefile.am | 3 --- lib/libzpool/include/Makefile.am | 3 +++ lib/{libspl => libzpool}/include/sys/abd_impl_os.h | 0 lib/{libspl => libzpool}/include/sys/abd_os.h | 0 lib/{libspl => libzpool}/include/sys/trace_zfs.h | 0 scripts/spdxcheck.pl | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename lib/{libspl => libzpool}/include/sys/abd_impl_os.h (100%) rename lib/{libspl => libzpool}/include/sys/abd_os.h (100%) rename lib/{libspl => libzpool}/include/sys/trace_zfs.h (100%) diff --git a/lib/libspl/include/Makefile.am b/lib/libspl/include/Makefile.am index be65bdb22..4eb534d16 100644 --- a/lib/libspl/include/Makefile.am +++ b/lib/libspl/include/Makefile.am @@ -24,8 +24,6 @@ libspl_rpc_HEADERS = \ libspl_sysdir = $(libspldir)/sys libspl_sys_HEADERS = \ - %D%/sys/abd_os.h \ - %D%/sys/abd_impl_os.h \ %D%/sys/acl.h \ %D%/sys/acl_impl.h \ %D%/sys/asm_linkage.h \ @@ -58,7 +56,6 @@ libspl_sys_HEADERS = \ %D%/sys/systeminfo.h \ %D%/sys/time.h \ %D%/sys/trace_spl.h \ - %D%/sys/trace_zfs.h \ %D%/sys/tunables.h \ %D%/sys/types.h \ %D%/sys/types32.h \ diff --git a/lib/libzpool/include/Makefile.am b/lib/libzpool/include/Makefile.am index 06fffdc75..54d10e623 100644 --- a/lib/libzpool/include/Makefile.am +++ b/lib/libzpool/include/Makefile.am @@ -1,3 +1,6 @@ libzpool_sysdir = $(includedir)/libzpool/sys libzpool_sys_HEADERS = \ + %D%/sys/abd_os.h \ + %D%/sys/abd_impl_os.h \ + %D%/sys/trace_zfs.h \ %D%/sys/zfs_context_os.h diff --git a/lib/libspl/include/sys/abd_impl_os.h b/lib/libzpool/include/sys/abd_impl_os.h similarity index 100% rename from lib/libspl/include/sys/abd_impl_os.h rename to lib/libzpool/include/sys/abd_impl_os.h diff --git a/lib/libspl/include/sys/abd_os.h b/lib/libzpool/include/sys/abd_os.h similarity index 100% rename from lib/libspl/include/sys/abd_os.h rename to lib/libzpool/include/sys/abd_os.h diff --git a/lib/libspl/include/sys/trace_zfs.h b/lib/libzpool/include/sys/trace_zfs.h similarity index 100% rename from lib/libspl/include/sys/trace_zfs.h rename to lib/libzpool/include/sys/trace_zfs.h diff --git a/scripts/spdxcheck.pl b/scripts/spdxcheck.pl index 4d4e14368..e119f1351 100755 --- a/scripts/spdxcheck.pl +++ b/scripts/spdxcheck.pl @@ -130,8 +130,8 @@ my $untagged_patterns = q( lib/libspl/include/os/freebsd/sys/sysmacros.h lib/libspl/include/sys/string.h lib/libspl/include/sys/trace_spl.h - lib/libspl/include/sys/trace_zfs.h lib/libzdb/libzdb.c + lib/libzpool/include/sys/trace_zfs.h module/lua/setjmp/setjmp.S module/lua/setjmp/setjmp_ppc.S module/zstd/include/sparc_compat.h