d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move zstd sources from libzfs to libzpool

Browse Source 
zstd is kernel code that was not supposed to be in libzfs.

libzpool provides userland shims for kernel code and is where the
zstd code needs to be included.

Reported by:	John Kennedy
Discussed with:	mmacy
Sponsored by:	iXsystems, Inc.
This commit is contained in:
Ryan Moeller 2020-08-26 19:03:15 +00:00
parent 67c97ec2d6
commit 507cf10ad5
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cddl/lib/libzfs/Makefile
View File

@ -58,10 +58,6 @@ KERNEL_C = \
zprop_common.c
KERNEL_C+= zstd.c \
zfs_zstd.c
ARCH_C =
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
ARCH_C += zfs_fletcher_intel.c \
@ -94,8 +90,6 @@ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
CFLAGS+= -DHAVE_ISSETUGID
CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
CFLAGS.zfs_zstd.c= -Wno-cast-qual -Wno-pointer-arith
CFLAGS.zstd.c= -fno-tree-vectorize
.include <bsd.lib.mk>

8
cddl/lib/libzpool/Makefile
View File

@ -8,6 +8,9 @@ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
.PATH: ${ZFSTOP}/module/unicode
# LUA_SRCS
.PATH: ${ZFSTOP}/module/lua
# ZSTD_SRCS
.PATH: ${ZFSTOP}/module/zstd
.PATH: ${ZFSTOP}/module/zstd/lib
.PATH: ${ZFSTOP}/module/os/linux/zfs
@ -44,6 +47,7 @@ KERNEL_C = \
zfs_namecheck.c \
zfs_prop.c \
zfs_uio.c \
zfs_zstd.c \
zpool_prop.c \
zprop_common.c \
abd.c \
@ -167,6 +171,7 @@ KERNEL_C = \
zio_inject.c \
zle.c \
zrlock.c \
zstd.c \
zthr.c
ARCH_C =
@ -252,4 +257,7 @@ CSTD= c99
CFLAGS+= -g -DDEBUG=1
CFLAGS.zfs_zstd.c= -Wno-cast-qual -Wno-pointer-arith
CFLAGS.zstd.c+= -fno-tree-vectorize
.include <bsd.lib.mk>