From e282e98e79861a0a5cdbb9f387b25e317a12e0fc Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Sat, 8 Nov 2025 18:04:29 +1100 Subject: [PATCH] libzpool: add zfs_impl.c, remove from libicp This isn't used by libicp directly, but is by some clients, and relies on headers specific to the zfs module, which makes using it difficult otherwise. Also switch the checksum tests over to use libzpool, so they can get access to it. That's not exactly what we want in the long term, but the icp and zfs modules have a complicated relationship so this will do for now. Sponsored-by: https://despairlabs.com/sponsor/ Reviewed-by: Brian Behlendorf Signed-off-by: Rob Norris Closes #17861 --- lib/libicp/Makefile.am | 3 +-- lib/libzpool/Makefile.am | 1 + tests/zfs-tests/cmd/Makefile.am | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/libicp/Makefile.am b/lib/libicp/Makefile.am index b83ec461f..a8937e60b 100644 --- a/lib/libicp/Makefile.am +++ b/lib/libicp/Makefile.am @@ -38,8 +38,7 @@ nodist_libicp_la_SOURCES = \ module/icp/core/kcf_prov_lib.c \ module/icp/core/kcf_callprov.c \ module/icp/core/kcf_mech_tabs.c \ - module/icp/core/kcf_prov_tabs.c \ - module/zfs/zfs_impl.c + module/icp/core/kcf_prov_tabs.c if TARGET_CPU_AARCH64 nodist_libicp_la_SOURCES += \ diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am index f4a78b666..8340fe2ef 100644 --- a/lib/libzpool/Makefile.am +++ b/lib/libzpool/Makefile.am @@ -180,6 +180,7 @@ nodist_libzpool_la_SOURCES = \ module/zfs/zfs_crrd.c \ module/zfs/zfs_fm.c \ module/zfs/zfs_fuid.c \ + module/zfs/zfs_impl.c \ module/zfs/zfs_ratelimit.c \ module/zfs/zfs_rlock.c \ module/zfs/zfs_sa.c \ diff --git a/tests/zfs-tests/cmd/Makefile.am b/tests/zfs-tests/cmd/Makefile.am index 8d645248f..b4efefdb7 100644 --- a/tests/zfs-tests/cmd/Makefile.am +++ b/tests/zfs-tests/cmd/Makefile.am @@ -116,9 +116,7 @@ scripts_zfs_tests_bin_PROGRAMS += %D%/edonr_test %D%/skein_test \ %C%_edonr_test_SOURCES = %D%/checksum/edonr_test.c %C%_blake3_test_SOURCES = %D%/checksum/blake3_test.c %C%_skein_test_LDADD = \ - libicp.la \ - libspl.la \ - libspl_assert.la + libzpool.la %C%_sha2_test_LDADD = $(%C%_skein_test_LDADD) %C%_edonr_test_LDADD = $(%C%_skein_test_LDADD) %C%_blake3_test_LDADD = $(%C%_skein_test_LDADD)