Martin Matuska
dbd5678dca
Notable upstream pull request merges:
#13680 Add options to zfs redundant_metadata property
#13758 Allow mounting snapshots in .zfs/snapshot as a regular user
#13838 quota: disable quota check for ZVOL
#13839 quota: extend quota for dataset
#13973 Fix memory leaks in dmu_send()/dmu_send_obj()
#13977 Avoid unnecessary metaslab_check_free calling
#13978 PAM: Fix unchecked return value from zfs_key_config_load()
#13979 Handle possible null pointers from malloc/strdup/strndup()
#13997 zstream: allow decompress to fix metadata for uncompressed
records
#13998 zvol_wait logic may terminate prematurely
#14001 FreeBSD: Fix a pair of bugs in zfs_fhtovp()
#14003 Stop ganging due to past vdev write errors
#14039 Optimize microzaps
#14050 Fix draid2+2s metadata error on simultaneous 2 drive failures
#14062 zed: Avoid core dump if wholedisk property does not exist
#14077 Propagate extent_bytes change to autotrim thread
#14079 FreeBSD: vn_flush_cached_data: observe vnode locking contract
#14093 Fix ARC target collapse when zfs_arc_meta_limit_percent=100
#14106 Add ability to recompress send streams with new compression
algorithm
#14119 Deny receiving into encrypted datasets if the keys are not
loaded
#14120 Fix arc_p aggressive increase
#14129 zed: Prevent special vdev to be replaced by hot spare
#14133 Expose zfs_vdev_open_timeout_ms as a tunable
#14135 FreeBSD: Fix out of bounds read in zfs_ioctl_ozfs_to_legacy()
#14152 Adds the `-p` option to `zfs holds`
#14161 Handle and detect #13709's unlock regression
Obtained from: OpenZFS
OpenZFS commit: 2163cde450
39 lines
830 B
Makefile
39 lines
830 B
Makefile
# $FreeBSD$
|
|
|
|
ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
|
|
|
|
.PATH: ${ZFSTOP}/cmd/zstream
|
|
.PATH: ${ZFSTOP}/man/man8
|
|
|
|
PACKAGE= zfs
|
|
PROG= zstream
|
|
MAN= zstream.8
|
|
MLINKS= zstream.8 zstreamdump.8
|
|
INCS= zstream.h
|
|
SRCS= \
|
|
zstream.c \
|
|
zstream_decompress.c \
|
|
zstream_dump.c \
|
|
zstream_recompress.c \
|
|
zstream_redup.c \
|
|
zstream_token.c
|
|
|
|
SYMLINKS= ${BINDIR}/zstream ${BINDIR}/zstreamdump
|
|
|
|
WARNS?= 2
|
|
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}/module/icp/include \
|
|
-include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \
|
|
-DHAVE_ISSETUGID \
|
|
-include ${SRCTOP}/sys/modules/zfs/zfs_config.h
|
|
|
|
LIBADD= geom m nvpair umem uutil avl spl zfs_core zfs zutil zpool
|
|
|
|
.include <bsd.prog.mk>
|