git: ba27dd8be821 - main - zfs: merge OpenZFS master-9312e0fd1

[Peter Jeremy]

On 2021-Feb-22 15:01:15 +0100, "O. Hartmann" <ohartmann at walstatt.org> wrote:
>Am Mon, 22 Feb 2021 12:02:04 GMT
>Martin Matuska <mm at 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 at FreeBSD.org>
>> AuthorDate: 2021-02-22 11:35:56 +0000
>> Commit:     Martin Matuska <mm at 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 963 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/dev-commits-src-all/attachments/20210223/95ed0c11/attachment.sig>