From 654e7628d686baff69e269de85f96d31a3772396 Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Sat, 20 Dec 2025 11:52:18 +1100 Subject: [PATCH] u8_textprep: move into module/zfs Now that it's built into the main zfs module in all cases, there's no reason to put it in its own dir. Sponsored-by: https://despairlabs.com/sponsor/ Reviewed-by: Brian Behlendorf Signed-off-by: Rob Norris Closes #18071 --- lib/libzpool/Makefile.am | 3 +-- module/Kbuild.in | 7 +------ module/Makefile.bsd | 4 +--- module/{unicode => zfs}/u8_textprep.c | 0 4 files changed, 3 insertions(+), 11 deletions(-) rename module/{unicode => zfs}/u8_textprep.c (100%) diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am index c8c8adbb8..7909cbb07 100644 --- a/lib/libzpool/Makefile.am +++ b/lib/libzpool/Makefile.am @@ -46,8 +46,6 @@ nodist_libzpool_la_SOURCES = \ \ module/os/linux/zfs/zio_crypt.c \ \ - module/unicode/u8_textprep.c \ - \ module/zcommon/cityhash.c \ module/zcommon/simd_stat.c \ module/zcommon/zfeature_common.c \ @@ -137,6 +135,7 @@ nodist_libzpool_la_SOURCES = \ module/zfs/space_map.c \ module/zfs/space_reftree.c \ module/zfs/txg.c \ + module/zfs/u8_textprep.c \ module/zfs/uberblock.c \ module/zfs/unique.c \ module/zfs/vdev.c \ diff --git a/module/Kbuild.in b/module/Kbuild.in index fad4231ff..04bcdc9c0 100644 --- a/module/Kbuild.in +++ b/module/Kbuild.in @@ -216,12 +216,6 @@ NVPAIR_OBJS := \ zfs-objs += $(addprefix nvpair/,$(NVPAIR_OBJS)) -UNICODE_OBJS := \ - u8_textprep.o - -zfs-objs += $(addprefix unicode/,$(UNICODE_OBJS)) - - ZCOMMON_OBJS := \ cityhash.o \ simd_stat.o \ @@ -372,6 +366,7 @@ ZFS_OBJS := \ space_map.o \ space_reftree.o \ txg.o \ + u8_textprep.o \ uberblock.o \ unique.o \ vdev.o \ diff --git a/module/Makefile.bsd b/module/Makefile.bsd index c20fdc0c4..baef8dc94 100644 --- a/module/Makefile.bsd +++ b/module/Makefile.bsd @@ -230,9 +230,6 @@ SRCS+= abd_os.c \ zio_crypt.c \ zvol_os.c -#unicode -SRCS+= u8_textprep.c - #zcommon SRCS+= cityhash.c \ zfeature_common.c \ @@ -322,6 +319,7 @@ SRCS+= abd.c \ spa_misc.c \ spa_stats.c \ txg.c \ + u8_textprep.c \ uberblock.c \ unique.c \ vdev.c \ diff --git a/module/unicode/u8_textprep.c b/module/zfs/u8_textprep.c similarity index 100% rename from module/unicode/u8_textprep.c rename to module/zfs/u8_textprep.c