svn commit: r364830 - in head/cddl/lib: libzfs libzpool

[Ryan Moeller]

Author: freqlabs
Date: Wed Aug 26 19:03:15 2020
New Revision: 364830
URL: https://svnweb.freebsd.org/changeset/base/364830

Log:
  Move zstd sources from libzfs to libzpool
  
  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.

Modified:
  head/cddl/lib/libzfs/Makefile
  head/cddl/lib/libzpool/Makefile

Modified: head/cddl/lib/libzfs/Makefile
==============================================================================
--- head/cddl/lib/libzfs/Makefile	Wed Aug 26 19:00:17 2020	(r364829)
+++ head/cddl/lib/libzfs/Makefile	Wed Aug 26 19:03:15 2020	(r364830)
@@ -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/in
 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>

Modified: head/cddl/lib/libzpool/Makefile
==============================================================================
--- head/cddl/lib/libzpool/Makefile	Wed Aug 26 19:00:17 2020	(r364829)
+++ head/cddl/lib/libzpool/Makefile	Wed Aug 26 19:03:15 2020	(r364830)
@@ -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 =
@@ -251,5 +256,8 @@ CSTD=	c99
 # it without debugging.
 
 CFLAGS+=	-g -DDEBUG=1
+
+CFLAGS.zfs_zstd.c=	-Wno-cast-qual -Wno-pointer-arith
+CFLAGS.zstd.c+=	-fno-tree-vectorize
 
 .include <bsd.lib.mk>