Date: Tue, 23 Feb 2021 06:57:03 +1100 From: Peter Jeremy <peter@rulingia.com> To: Martin Matuska <mm@freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, "O. Hartmann" <ohartmann@walstatt.org> Subject: Re: git: ba27dd8be821 - main - zfs: merge OpenZFS master-9312e0fd1 Message-ID: <YDQMjx%2BAsRD05Gpv@server.rulingia.com> In-Reply-To: <20210222150142.4b76b7c6@thor.intern.walstatt.dynvpn.de> References: <202102221202.11MC24EB071531@gitrepo.freebsd.org> <20210222150142.4b76b7c6@thor.intern.walstatt.dynvpn.de>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On 2021-Feb-22 15:01:15 +0100, "O. Hartmann" <ohartmann@walstatt.org> wrote: >Am Mon, 22 Feb 2021 12:02:04 GMT >Martin Matuska <mm@FreeBSD.org> schrieb: > >> The branch main has been updated by mm: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=ba27dd8be821792e15bdabfac69fd6cab0cf9dd3 >> >> commit ba27dd8be821792e15bdabfac69fd6cab0cf9dd3 >> Merge: c02a28754bc2 0626917d0786 >> Author: Martin Matuska <mm@FreeBSD.org> >> AuthorDate: 2021-02-22 11:35:56 +0000 >> Commit: Martin Matuska <mm@FreeBSD.org> >> CommitDate: 2021-02-22 12:01:17 +0000 >> >> zfs: merge OpenZFS master-9312e0fd1 >> >> Notable upstream changes: >> 778869fa1 Fix reporting of mount progress >> e7adccf7f Disable use of hardware crypto offload drivers on FreeBSD >> 03e02e5b5 Fix checksum errors not being counted on repeated repair >> 64e0fe14f Restore FreeBSD resource usage accounting >> 11f2e9a49 Fix panic if scrubbing after removing a slog device ... >On FreeBSD 14-CURRENT, with ZFS statically builtin the kernel, this commit renders "make >buildkernel" to fail: > >[...] > >===> cam (all) >--- kernel --- >ld: error: undefined symbol: zfs_racct_read >>>> referenced by arc.c >>>> arc.o:(arc_read) >--- modules-all --- >--- all_subdir_cardbus --- >===> cardbus (all) >--- kernel --- > >ld: error: undefined symbol: zfs_racct_write >>>> referenced by dmu.c >>>> dmu.o:(dmu_buf_hold_array_by_dnode) >>>> referenced by dmu.c >>>> dmu.o:(dmu_assign_arcbuf_by_dnode) >*** [kernel] Error code 1 I can reproduce this as well. This commit has omitted the following line from sys/conf/files and therefore broken building ZFS into the kernel: contrib/openzfs/module/os/freebsd/zfs/zfs_racct.c optional zfs compile-with "${ZFS_C}" -- Peter Jeremy [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEE7rKYbDBnHnTmXCJ+FqWXoOSiCzQFAmA0DIRfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEVF QjI5ODZDMzA2NzFFNzRFNjVDMjI3RTE2QTU5N0EwRTRBMjBCMzQACgkQFqWXoOSi CzQ17A//anEHvLTFLe9/Japuop7tzxul7pGLHePUTbWcTKNO3dJEq3uAueFzkTCN c9c+Aq9eMd8Bas7JYY/gqVsmuwfDNyAK8H0s3r379IrNFCdt61rz9iMg1+byeLk1 GyfGp/CAJ0rd/SuCDp+cm4rIs5ZKm0YHnxVQSNUJIde3OjYda9hDeIiK1RZ0bHcm xkKrByP1Izm8Tv/nla8btQxaolnTCSrn/PtG15ULAqipawmxTPDdz9k4Jt/fAzVf 7t/7qaP+lPdcjXkdMkaJW7arYfLUgQEtZk10EuViqaUgfVx+3OFgunOonuJ97q8E jQGLPGvj3tHGktTAh4Mbt8iiKIA4NgSIr/NLWQgv2HSUFp6ZKO5CrWKS22/FDJGJ MM9bv5cLRt+PYtZBcRLusVGmklBwH2AHKrQ1WgELtS74jJBoT3zJBsY9M8LZTJSX KVsU8ay9BUB15gUvSr/f7ijA+gc8OUjNHW8m2IUYWwp6FyrRdMzAXsnXlUBhnOXd 6ZYiB/zn+lqlcHtkqYpxqwBVrYvQ6AoqEbUricri37XzO5WZ62J5Ol+SiX9TRlut i4dUgoewP7QTrIOvIf7I6D8Csu6uPoauQvFq/UmWfS9K9KBQfN40RKPrEDDRj5Ao wZueWxcmY7uZf2zK80gqZEoqgrAIJN8mxsFmty/Z/2oQ223oAF4= =Pe8y -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YDQMjx%2BAsRD05Gpv>