Re: git: e92ffd9b6268 - main - zfs: merge openzfs/zfs@17b2ae0b2 (master) into main
- In reply to: Martin Matuska : "git: e92ffd9b6268 - main - zfs: merge openzfs/zfs@17b2ae0b2 (master) into main"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 23 Jan 2022 08:28:00 UTC
On Sat, 22 Jan 2022 23:10:07 GMT Martin Matuska <mm@FreeBSD.org> wrote: > The branch main has been updated by mm: > > URL: https://cgit.FreeBSD.org/src/commit/?id=e92ffd9b626833ebdbf2742c8ffddc6cd94b963e > > commit e92ffd9b626833ebdbf2742c8ffddc6cd94b963e > Merge: 3c3df3660072 17b2ae0b24d4 > Author: Martin Matuska <mm@FreeBSD.org> > AuthorDate: 2022-01-22 22:05:15 +0000 > Commit: Martin Matuska <mm@FreeBSD.org> > CommitDate: 2022-01-22 22:05:15 +0000 > > zfs: merge openzfs/zfs@17b2ae0b2 (master) into main > > Notable upstream pull request merges: > #12766 Fix error propagation from lzc_send_redacted > #12805 Updated the lz4 decompressor > #12851 FreeBSD: Provide correct file generation number > #12857 Verify dRAID empty sectors > #12874 FreeBSD: Update argument types for VOP_READDIR > #12896 Reduce number of arc_prune threads > #12934 FreeBSD: Fix zvol_*_open() locking > #12947 lz4: Cherrypick fix for CVE-2021-3520 > #12961 FreeBSD: Fix leaked strings in libspl mnttab > #12964 Fix handling of errors from dmu_write_uio_dbuf() on FreeBSD > #12981 Introduce a flag to skip comparing the local mac when raw sending > #12985 Avoid memory allocations in the ARC eviction thread > > Obtained from: OpenZFS [...] This commit brakes kernel linking, when ZFS is compiled statically into the kernel: [...] --- kernel.full --- ld: error: undefined symbol: lz4_init >>> referenced by zio.c:245 (/usr/src/sys/contrib/openzfs/module/zfs/zio.c:245) >>> zio.o:(zio_init) ld: error: undefined symbol: lz4_fini >>> referenced by zio.c:302 (/usr/src/sys/contrib/openzfs/module/zfs/zio.c:302) >>> zio.o:(zio_fini) ld: error: undefined symbol: lz4_compress_zfs >>> referenced by zio_compress.c >>> zio_compress.o:(zio_compress_table) ld: error: undefined symbol: lz4_decompress_zfs >>> referenced by zio_compress.c >>> zio_compress.o:(zio_compress_table) --- modules-all --- --- all_subdir_geom/geom_part --- --- all_subdir_geom/geom_part/geom_part_ebr --- ===> geom/geom_part/geom_part_ebr (all) --- all_subdir_hid --- --- all_subdir_hid/ps4dshock --- ===> hid/ps4dshock (all) --- kernel.full --- *** [kernel.full] Error code 1