From f49b93e2c747e20992f31435ee863d6b49d3f35d Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Sun, 26 Oct 2025 14:47:11 +1100 Subject: [PATCH] libzpool: move zfs_context_os.h from libspl Keeping the spl/zfs module split, libzpool is the zfs module for userspace. Headers and functions specific to it belong there. Sponsored-by: https://despairlabs.com/sponsor/ Reviewed-by: Brian Behlendorf Signed-off-by: Rob Norris Closes #17861 --- config/Rules.am | 3 ++- lib/libspl/include/Makefile.am | 1 - lib/libzpool/Makefile.am | 2 ++ lib/libzpool/include/Makefile.am | 3 +++ lib/{libspl => libzpool}/include/sys/zfs_context_os.h | 0 5 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 lib/libzpool/include/Makefile.am rename lib/{libspl => libzpool}/include/sys/zfs_context_os.h (100%) diff --git a/config/Rules.am b/config/Rules.am index deffa352e..9c0714c82 100644 --- a/config/Rules.am +++ b/config/Rules.am @@ -10,7 +10,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/module/icp/include \ -I$(top_srcdir)/lib/libspl/include \ - -I$(top_srcdir)/lib/libspl/include/os/@ac_system_l@ + -I$(top_srcdir)/lib/libspl/include/os/@ac_system_l@ \ + -I$(top_srcdir)/lib/libzpool/include AM_LIBTOOLFLAGS = --silent diff --git a/lib/libspl/include/Makefile.am b/lib/libspl/include/Makefile.am index 3a744def6..be65bdb22 100644 --- a/lib/libspl/include/Makefile.am +++ b/lib/libspl/include/Makefile.am @@ -65,7 +65,6 @@ libspl_sys_HEADERS = \ %D%/sys/uio.h \ %D%/sys/vnode.h \ %D%/sys/wmsum.h \ - %D%/sys/zfs_context_os.h \ %D%/sys/zone.h libspl_ia32dir = $(libspldir)/sys/ia32 diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am index 4658e025e..db8458885 100644 --- a/lib/libzpool/Makefile.am +++ b/lib/libzpool/Makefile.am @@ -1,3 +1,5 @@ +include $(srcdir)/%D%/include/Makefile.am + libzpool_la_CFLAGS = $(AM_CFLAGS) $(KERNEL_CFLAGS) $(LIBRARY_CFLAGS) libzpool_la_CFLAGS += $(ZLIB_CFLAGS) diff --git a/lib/libzpool/include/Makefile.am b/lib/libzpool/include/Makefile.am new file mode 100644 index 000000000..06fffdc75 --- /dev/null +++ b/lib/libzpool/include/Makefile.am @@ -0,0 +1,3 @@ +libzpool_sysdir = $(includedir)/libzpool/sys +libzpool_sys_HEADERS = \ + %D%/sys/zfs_context_os.h diff --git a/lib/libspl/include/sys/zfs_context_os.h b/lib/libzpool/include/sys/zfs_context_os.h similarity index 100% rename from lib/libspl/include/sys/zfs_context_os.h rename to lib/libzpool/include/sys/zfs_context_os.h