openzfs · robn · Jul 6, 2025 · Oct 26, 2025 · Oct 26, 2025 · Oct 16, 2025
diff --git a/cmd/raidz_test/raidz_test.c b/cmd/raidz_test/raidz_test.c
@@ -33,6 +33,7 @@
 #include <sys/vdev_raidz_impl.h>
 #include <assert.h>
 #include <stdio.h>
+#include <libzpool.h>
 #include "raidz_test.h"
 
 static int *rand_data;

diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
@@ -89,6 +89,7 @@
 #include <sys/zstd/zstd.h>
 #include <sys/backtrace.h>
 
+#include <libzpool.h>
 #include <libnvpair.h>
 #include <libzutil.h>
 #include <libzfs_core.h>

diff --git a/cmd/zed/Makefile.am b/cmd/zed/Makefile.am
@@ -3,6 +3,8 @@ include $(srcdir)/%D%/zed.d/Makefile.am
 zed_CFLAGS  = $(AM_CFLAGS)
 zed_CFLAGS += $(LIBUDEV_CFLAGS) $(LIBUUID_CFLAGS)
 
+zed_CPPFLAGS = $(AM_CPPFLAGS) $(LIBZPOOL_CPPFLAGS)
+
 sbin_PROGRAMS   += zed
 CPPCHECKTARGETS += zed
 

diff --git a/cmd/zhack.c b/cmd/zhack.c
@@ -55,6 +55,7 @@
 #include <zfeature_common.h>
 #include <libzutil.h>
 #include <sys/metaslab_impl.h>
+#include <libzpool.h>
 
 static importargs_t g_importargs;
 static char *g_pool;

diff --git a/cmd/zinject/Makefile.am b/cmd/zinject/Makefile.am
@@ -1,6 +1,8 @@
 sbin_PROGRAMS   += zinject
 CPPCHECKTARGETS += zinject
 
+zinject_CPPFLAGS  = $(AM_CPPFLAGS) $(LIBZPOOL_CPPFLAGS)
+
 zinject_SOURCES = \
 	%D%/translate.c \
 	%D%/zinject.c \

diff --git a/cmd/zpool/Makefile.am b/cmd/zpool/Makefile.am
@@ -1,7 +1,7 @@
 zpool_CFLAGS  = $(AM_CFLAGS)
 zpool_CFLAGS += $(LIBBLKID_CFLAGS) $(LIBUUID_CFLAGS)
 
-zpool_CPPFLAGS  = $(AM_CPPFLAGS)
+zpool_CPPFLAGS  = $(AM_CPPFLAGS) $(LIBZPOOL_CPPFLAGS)
 zpool_CPPFLAGS += -I$(srcdir)/%D%
 
 sbin_PROGRAMS   += zpool

diff --git a/cmd/ztest.c b/cmd/ztest.c
@@ -139,6 +139,7 @@
 #include <sys/crypto/icp.h>
 #include <sys/zfs_impl.h>
 #include <sys/backtrace.h>
+#include <libzpool.h>
 
 static int ztest_fd_data = -1;
 static int ztest_fd_rand = -1;

diff --git a/config/Rules.am b/config/Rules.am
@@ -8,9 +8,9 @@ AM_CPPFLAGS = \
 	-include $(top_builddir)/zfs_config.h \
 	-I$(top_builddir)/include \
 	-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
 
@@ -73,4 +73,5 @@ LIBRARY_CFLAGS      = -no-suppress
 # Since ZFS_DEBUG can change shared data structures, all libzpool users must
 # be compiled with the same flags.
 # See https://github.com/openzfs/zfs/issues/16476
-LIBZPOOL_CPPFLAGS = -DDEBUG -UNDEBUG -DZFS_DEBUG
+LIBZPOOL_CPPFLAGS  = -DDEBUG -UNDEBUG -DZFS_DEBUG
+LIBZPOOL_CPPFLAGS += -I$(top_srcdir)/include/os/@ac_system_l@/zfs
diff --git a/contrib/pam_zfs_key/Makefile.am b/contrib/pam_zfs_key/Makefile.am
@@ -1,6 +1,8 @@
 %C%_pam_zfs_key_la_CFLAGS  = $(AM_CFLAGS)
 %C%_pam_zfs_key_la_CFLAGS += $(LIBCRYPTO_CFLAGS)
 
+pam_zfs_key_la_CPPFLAGS  = $(AM_CPPFLAGS) $(LIBZPOOL_CPPFLAGS)
+
 pammodule_LTLIBRARIES = %D%/pam_zfs_key.la
 
 %C%_pam_zfs_key_la_SOURCES = %D%/pam_zfs_key.c

diff --git a/include/Makefile.am b/include/Makefile.am
@@ -191,6 +191,7 @@ USER_H = \
 	libzfs.h \
 	libzfs_core.h \
 	libzfsbootenv.h \
+	libzpool.h \
 	libzutil.h \
 	thread_pool.h
 

diff --git a/include/libzpool.h b/include/libzpool.h
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: CDDL-1.0
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or https://opensource.org/licenses/CDDL-1.0.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012, 2018 by Delphix. All rights reserved.
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
+ */
+
+#ifndef _LIBZPOOL_H
+#define	_LIBZPOOL_H extern __attribute__((visibility("default")))
+
+#include <sys/zfs_context.h>
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+extern char *vn_dumpdir;
+
+_LIBZPOOL_H void kernel_init(int mode);
+_LIBZPOOL_H void kernel_fini(void);
+
+struct spa;
+_LIBZPOOL_H void show_pool_stats(struct spa *);
+_LIBZPOOL_H int handle_tunable_option(const char *, boolean_t);
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif
diff --git a/include/libzutil.h b/include/libzutil.h
@@ -165,6 +165,7 @@ _LIBZUTIL_H void zfs_nicetime(uint64_t, char *, size_t);
 _LIBZUTIL_H void zfs_niceraw(uint64_t, char *, size_t);
 
 #define	nicenum(num, buf, size)	zfs_nicenum(num, buf, size)
+#define	NN_NUMBUF_SZ	(6)
 
 _LIBZUTIL_H void zpool_dump_ddt(const ddt_stat_t *, const ddt_histogram_t *);
 _LIBZUTIL_H int zpool_history_unpack(char *, uint64_t, uint64_t *, nvlist_t ***,

diff --git a/include/os/freebsd/Makefile.am b/include/os/freebsd/Makefile.am
@@ -44,7 +44,6 @@ noinst_HEADERS = \
 	%D%/spl/sys/procfs_list.h \
 	%D%/spl/sys/random.h \
 	%D%/spl/sys/rwlock.h \
-	%D%/spl/sys/sdt.h \
 	%D%/spl/sys/sid.h \
 	%D%/spl/sys/sig.h \
 	%D%/spl/sys/simd.h \
@@ -63,7 +62,6 @@ noinst_HEADERS = \
 	%D%/spl/sys/time.h \
 	%D%/spl/sys/timer.h \
 	%D%/spl/sys/trace.h \
-	%D%/spl/sys/trace_zfs.h \
 	%D%/spl/sys/types.h \
 	%D%/spl/sys/types32.h \
 	%D%/spl/sys/uio.h \
@@ -82,10 +80,12 @@ noinst_HEADERS = \
 	%D%/zfs/sys/arc_os.h \
 	%D%/zfs/sys/freebsd_crypto.h \
 	%D%/zfs/sys/freebsd_event.h \
+	%D%/zfs/sys/trace_zfs.h \
 	%D%/zfs/sys/vdev_os.h \
 	%D%/zfs/sys/zfs_bootenv_os.h \
 	%D%/zfs/sys/zfs_context_os.h \
 	%D%/zfs/sys/zfs_ctldir.h \
+	%D%/zfs/sys/zfs_debug_os.h \
 	%D%/zfs/sys/zfs_dir.h \
 	%D%/zfs/sys/zfs_ioctl_compat.h \
 	%D%/zfs/sys/zfs_vfsops_os.h \

diff --git a/include/os/freebsd/spl/sys/trace_zfs.h → include/os/freebsd/zfs/sys/trace_zfs.h b/include/os/freebsd/spl/sys/trace_zfs.h → include/os/freebsd/zfs/sys/trace_zfs.h
diff --git a/include/os/freebsd/spl/sys/sdt.h → include/os/freebsd/zfs/sys/zfs_debug_os.h b/include/os/freebsd/spl/sys/sdt.h → include/os/freebsd/zfs/sys/zfs_debug_os.h
@@ -27,10 +27,11 @@
  * $FreeBSD$
  */
 
-#ifndef _OPENSOLARIS_SYS_SDT_H_
-#define	_OPENSOLARIS_SYS_SDT_H_
+#ifndef _SYS_ZFS_DEBUG_OS_H
+#define	_SYS_ZFS_DEBUG_OS_H
+
+#include <sys/sdt.h>
 
-#include_next <sys/sdt.h>
 #ifdef KDTRACE_HOOKS
 SDT_PROBE_DECLARE(sdt, , , set__error);
 
@@ -44,4 +45,4 @@ SDT_PROBE_DECLARE(sdt, , , set__error);
 #define	SET_ERROR(err) (err)
 #endif
 
-#endif	/* _OPENSOLARIS_SYS_SDT_H_ */
+#endif	/* _SYS_ZFS_DEBUG_OS_H */
diff --git a/include/os/linux/Makefile.am b/include/os/linux/Makefile.am
@@ -41,6 +41,7 @@ kernel_sys_HEADERS = \
 	%D%/zfs/sys/zfs_bootenv_os.h \
 	%D%/zfs/sys/zfs_context_os.h \
 	%D%/zfs/sys/zfs_ctldir.h \
+	%D%/zfs/sys/zfs_debug_os.h \
 	%D%/zfs/sys/zfs_dir.h \
 	%D%/zfs/sys/zfs_vfsops_os.h \
 	%D%/zfs/sys/zfs_vnops_os.h \
@@ -97,7 +98,6 @@ kernel_spl_sys_HEADERS = \
 	%D%/spl/sys/time.h \
 	%D%/spl/sys/timer.h \
 	%D%/spl/sys/trace.h \
-	%D%/spl/sys/trace_spl.h \
 	%D%/spl/sys/trace_taskq.h \
 	%D%/spl/sys/tsd.h \
 	%D%/spl/sys/types.h \

diff --git a/include/os/linux/spl/sys/sysmacros.h b/include/os/linux/spl/sys/sysmacros.h
@@ -34,11 +34,6 @@
 #include <sys/signal.h>
 #include <asm/page.h>
 
-
-#ifndef _KERNEL
-#define	_KERNEL				__KERNEL__
-#endif
-
 #define	FALSE				0
 #define	TRUE				1
 
@@ -202,9 +197,6 @@ makedev(unsigned int major, unsigned int minor)
 #define	P2SAMEHIGHBIT_TYPED(x, y, type) \
 	(((type)(x) ^ (type)(y)) < ((type)(x) & (type)(y)))
 
-#define	SET_ERROR(err) \
-	(__set_error(__FILE__, __func__, __LINE__, err), err)
-
 #include <linux/sort.h>
 #define	qsort(base, num, size, cmp)		\
 	sort(base, num, size, cmp, NULL)

diff --git a/include/os/linux/zfs/sys/zfs_debug_os.h b/include/os/linux/zfs/sys/zfs_debug_os.h
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: CDDL-1.0
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or https://opensource.org/licenses/CDDL-1.0.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+#ifndef _SYS_ZFS_DEBUG_OS_H
+#define	_SYS_ZFS_DEBUG_OS_H
+
+#define	 SET_ERROR(err) \
+	(__set_error(__FILE__, __func__, __LINE__, err), err)
+
+#endif	/* _SYS_ZFS_DEBUG_OS_H */
diff --git a/include/sys/crypto/common.h b/include/sys/crypto/common.h
@@ -38,6 +38,8 @@ extern "C" {
 #endif
 
 #include <sys/zfs_context.h>
+#include <sys/types.h>
+#include <sys/uio.h>
 
 /* Cryptographic Mechanisms */
 

diff --git a/include/sys/zfs_acl.h b/include/sys/zfs_acl.h
@@ -29,8 +29,8 @@
 #ifdef _KERNEL
 #include <sys/isa_defs.h>
 #include <sys/types32.h>
-#include <sys/xvattr.h>
 #endif
+#include <sys/xvattr.h>
 #include <sys/acl.h>
 #include <sys/dmu.h>
 #include <sys/zfs_fuid.h>