diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2022-06-03 18:58:39 +0300 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2022-06-03 19:17:53 +0300 |
| commit | e3aa18ad71782a73d3dd9dd3d526bbd2b607ca16 (patch) | |
| tree | 6c0de524d7951bac89d34ea7e67c7c8c87974c23 /cddl | |
| parent | 645886d028c85b3cb9fb36e96b1edc661cf4c0d8 (diff) | |
| parent | b9d98453f9387c413f91d1d9cdb0cba8e04dbd95 (diff) | |
zfs: merge openzfs/zfs@b9d98453f
Notable upstream pull request merges:
#12321 Fix inflated quiesce time caused by lwb_tx during zil_commit()
#13244 zstd early abort
#13360 Verify BPs as part of spa_load_verify_cb()
#13452 More speculative prefetcher improvements
#13466 Expose zpool guids through kstats
#13476 Refactor Log Size Limit
#13484 FreeBSD: libspl: Add locking around statfs globals
#13498 Cancel in-progress rebuilds when we finish removal
#13499 zed: Take no action on scrub/resilver checksum errors
#13513 Remove wrong assertion in log spacemap
Obtained from: OpenZFS
OpenZFS commit: b9d98453f9387c413f91d1d9cdb0cba8e04dbd95
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/usr.sbin/zfsd/Makefile.common | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cddl/usr.sbin/zfsd/Makefile.common b/cddl/usr.sbin/zfsd/Makefile.common index 5e9257d7b37e..68d921c90e37 100644 --- a/cddl/usr.sbin/zfsd/Makefile.common +++ b/cddl/usr.sbin/zfsd/Makefile.common @@ -24,7 +24,7 @@ CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccomp CFLAGS+= -I${SRCTOP}/cddl/usr.sbin # use issetugid(2) -CFLAGS+= -D_MACHINE_FLOAT_H_ -DHAVE_ISSETUGID +CFLAGS+= -DHAVE_ISSETUGID LIBADD+= devdctl zfs util geom bsdxml sbuf nvpair avl uutil zutil |