Skip to content

Commit e282e98

Browse files
robnbehlendorf
authored andcommitted
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 <behlendorf1@llnl.gov> Signed-off-by: Rob Norris <robn@despairlabs.com> Closes #17861
1 parent 677d6ed commit e282e98

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

lib/libicp/Makefile.am

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ nodist_libicp_la_SOURCES = \
3838
module/icp/core/kcf_prov_lib.c \
3939
module/icp/core/kcf_callprov.c \
4040
module/icp/core/kcf_mech_tabs.c \
41-
module/icp/core/kcf_prov_tabs.c \
42-
module/zfs/zfs_impl.c
41+
module/icp/core/kcf_prov_tabs.c
4342

4443
if TARGET_CPU_AARCH64
4544
nodist_libicp_la_SOURCES += \

lib/libzpool/Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ nodist_libzpool_la_SOURCES = \
180180
module/zfs/zfs_crrd.c \
181181
module/zfs/zfs_fm.c \
182182
module/zfs/zfs_fuid.c \
183+
module/zfs/zfs_impl.c \
183184
module/zfs/zfs_ratelimit.c \
184185
module/zfs/zfs_rlock.c \
185186
module/zfs/zfs_sa.c \

tests/zfs-tests/cmd/Makefile.am

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,7 @@ scripts_zfs_tests_bin_PROGRAMS += %D%/edonr_test %D%/skein_test \
116116
%C%_edonr_test_SOURCES = %D%/checksum/edonr_test.c
117117
%C%_blake3_test_SOURCES = %D%/checksum/blake3_test.c
118118
%C%_skein_test_LDADD = \
119-
libicp.la \
120-
libspl.la \
121-
libspl_assert.la
119+
libzpool.la
122120
%C%_sha2_test_LDADD = $(%C%_skein_test_LDADD)
123121
%C%_edonr_test_LDADD = $(%C%_skein_test_LDADD)
124122
%C%_blake3_test_LDADD = $(%C%_skein_test_LDADD)

0 commit comments

Comments
 (0)