Merge OpenZFS support in to HEAD.

The primary benefit is maintaining a completely shared
code base with the community allowing FreeBSD to receive
new features sooner and with less effort.

I would advise against doing 'zpool upgrade'
or creating indispensable pools using new
features until this change has had a month+
to soak.

Work on merging FreeBSD support in to what was
at the time "ZFS on Linux" began in August 2018.
I first publicly proposed transitioning FreeBSD
to (new) OpenZFS on December 18th, 2018. FreeBSD
support in OpenZFS was finally completed in December
2019. A CFT for downstreaming OpenZFS support in
to FreeBSD was first issued on July 8th. All issues
that were reported have been addressed or, for
a couple of less critical matters there are
pull requests in progress with OpenZFS. iXsystems
has tested and dogfooded extensively internally.
The TrueNAS 12 release is based on OpenZFS with
some additional features that have not yet made
it upstream.

Improvements include:
  project quotas, encrypted datasets,
  allocation classes, vectorized raidz,
  vectorized checksums, various command line
  improvements, zstd compression.

Thanks to those who have helped along the way:
Ryan Moeller, Allan Jude, Zack Welch, and many
others.

Sponsored by:	iXsystems, Inc.
Differential Revision:	https://reviews.freebsd.org/D25872

2 files changed, 135 insertions, 41 deletions

diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
index e3645bd362b7..40f713d069c8 100644
--- a/cddl/sbin/zfs/Makefile
+++ b/cddl/sbin/zfs/Makefile
@@ -1,27 +1,77 @@
 # $FreeBSD$
 
-.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zfs
+ZFSTOP=	${SRCTOP}/sys/contrib/openzfs
+
+.PATH: ${ZFSTOP}/cmd/zfs
+.PATH: ${ZFSTOP}/man/man8
+.PATH: ${ZFSTOP}/module/os/freebsd/spl
 
 PACKAGE=	runtime
 PROG=	zfs
-MAN=	zfs.8 zfs-program.8
-SRCS=	zfs_main.c zfs_iter.c
+MAN= \
+	zfs.8 \
+	zfs-allow.8 \
+	zfs-bookmark.8 \
+	zfs-change-key.8 \
+	zfs-clone.8 \
+	zfs-create.8 \
+	zfs-destroy.8 \
+	zfs-diff.8 \
+	zfs-get.8 \
+	zfs-groupspace.8 \
+	zfs-hold.8 \
+	zfs-inherit.8 \
+	zfs-jail.8 \
+	zfs-list.8 \
+	zfs-load-key.8 \
+	zfs-mount.8 \
+	zfs-program.8 \
+	zfs-project.8 \
+	zfs-projectspace.8 \
+	zfs-promote.8 \
+	zfs-receive.8 \
+	zfs-recv.8 \
+	zfs-redact.8 \
+	zfs-release.8 \
+	zfs-rename.8 \
+	zfs-rollback.8 \
+	zfs-send.8 \
+	zfs-set.8 \
+	zfs-share.8 \
+	zfs-snapshot.8 \
+	zfs-unallow.8 \
+	zfs-unjail.8 \
+	zfs-unload-key.8 \
+	zfs-unmount.8 \
+	zfs-upgrade.8 \
+	zfs-userspace.8 \
+	zfs-wait.8 \
+	zfsconcepts.8 \
+	zfsprops.8
+SRCS= \
+	zfs_iter.c \
+	zfs_iter.h \
+	zfs_main.c \
+	zfs_util.h \
+	zfs_project.c \
+	zfs_projectutil.h
 
-WARNS?=	0
-CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
-CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem
-CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
-CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head
-CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common
-CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common
-CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libumem/common
-CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair
-CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common
-CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs
+WARNS?=	2
 
-LIBADD=	jail nvpair uutil zfs_core zfs
+CFLAGS+= \
+	-DIN_BASE \
+	-I${ZFSTOP}/include \
+	-I${ZFSTOP}/include/os/freebsd \
+	-I${ZFSTOP}/lib/libspl/include \
+	-I${ZFSTOP}/lib/libspl/include/os/freebsd \
+	-I${SRCTOP}/sys \
+	-I${SRCTOP}/cddl/compat/opensolaris/include \
+	-I${ZFSTOP}/module/icp/include \
+	-include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \
+	-DHAVE_ISSETUGID \
+	-include ${SRCTOP}/sys/modules/zfs/zfs_config.h \
+	-I${SRCTOP}/sys/modules/zfs
 
+LIBADD=	jail avl nvpair geom  uutil zfs_core spl tpool zutil zfs m crypto
+LDADD+=	-pthread
 .include <bsd.prog.mk>
diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
index f4a3b9b6f5cc..6928cb132780 100644
--- a/cddl/sbin/zpool/Makefile
+++ b/cddl/sbin/zpool/Makefile
@@ -1,32 +1,76 @@
 # $FreeBSD$
 
-.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zpool
-.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/stat/common
-.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs
+ZFSTOP=	${SRCTOP}/sys/contrib/openzfs
+
+.PATH: ${ZFSTOP}/man/man5
+.PATH: ${ZFSTOP}/man/man8
+.PATH: ${ZFSTOP}/cmd/zpool
+.PATH: ${ZFSTOP}/cmd/zpool/os/freebsd
+
 
 PACKAGE=	runtime
 PROG=	zpool
-MAN=	zpool.8 zpool-features.7
-SRCS=	zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c zfs_comutil.c
-SRCS+=	timestamp.c
+MAN= \
+	spl-module-parameters.5 \
+	zfs-module-parameters.5 \
+	zpool.8 \
+	zpool-add.8 \
+	zpool-attach.8 \
+	zpool-checkpoint.8 \
+	zpool-clear.8 \
+	zpool-create.8 \
+	zpool-destroy.8 \
+	zpool-detach.8 \
+	zpool-events.8 \
+	zpool-export.8 \
+	zpool-features.5 \
+	zpool-get.8 \
+	zpool-history.8 \
+	zpool-import.8 \
+	zpool-initialize.8 \
+	zpool-iostat.8 \
+	zpool-labelclear.8 \
+	zpool-list.8 \
+	zpool-offline.8 \
+	zpool-online.8 \
+	zpool-reguid.8 \
+	zpool-remove.8 \
+	zpool-reopen.8 \
+	zpool-replace.8 \
+	zpool-resilver.8 \
+	zpool-scrub.8 \
+	zpool-set.8 \
+	zpool-split.8 \
+	zpool-status.8 \
+	zpool-sync.8 \
+	zpool-trim.8 \
+	zpool-upgrade.8 \
+	zpool-wait.8 \
+	zpoolconcepts.8 \
+	zpoolprops.8
+SRCS= \
+	zpool_iter.c \
+	zpool_main.c \
+	zpool_util.c \
+	zpool_util.h \
+	zpool_vdev.c \
+	zpool_vdev_os.c
 
-WARNS?=	0
-CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
-CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem
-CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
-CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head
-CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libumem/common
-CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common
-CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common
-CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair
-CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs
-CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common
-CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/cmd/stat/common
+WARNS?=	2
 
-LIBADD=	geom nvpair uutil zfs
+CFLAGS+= \
+	-DIN_BASE \
+	-I${ZFSTOP}/include \
+	-I${ZFSTOP}/lib/libspl/include \
+	-I${ZFSTOP}/lib/libspl/include/os/freebsd \
+	-I${SRCTOP}/sys \
+	-I${SRCTOP}/cddl/compat/opensolaris/include \
+	-I${ZFSTOP}/cmd/zpool \
+	-include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \
+	-DHAVE_ISSETUGID \
+	-include ${SRCTOP}/sys/modules/zfs/zfs_config.h \
+	-DSYSCONFDIR=\"/etc\"
 
+LIBADD=	geom nvpair uutil zfs zutil avl spl tpool zfs_core m
+LDADD+= 	-pthread
 .include <bsd.prog.mk>