Some existing changes in FreeBSD need not be appropriate to openzfs but it is more likely that many of the same files would eventually have some sort of change in openzfs's main dealing with what FreeBSD has run into from the import.
Looking around, the following are the FreeBSD adjustments in place in files that did not seem to be adjusted yet in openzfs's main. A few are just tracking changes in FreeBSD's main that are not tied to the import. I added a few notes in []'s. The 3 [TEMPORARY]'s may well never have related openzfs source code, for example. The other changes did seem to have code updates intended to deal with problems associated with the import. No claim to know how well the changes work when they do not match what my prior testing dealt with. include/os/freebsd/spl/sys/simd_arm.h (not updated in openzfs master): d6e24901349d zfs: disable kernel fpu usage on arm and aarc64 Mateusz Guzik [ARM PART] include/os/freebsd/zfs/sys/zfs_context_os.h (not updated in openzfs master): 8e9db62e7423 zfs: Appease set by unused warnings for spl_fstrans_*mark stubs. John Baldwin [FREEBSD TRACKING] include/os/freebsd/zfs/sys/zfs_vfsops_os.h (not updated in openzfs master): 068913e4ba3d zfs: Add vfs.zfs.bclone_enabled sysctl. Pawel Jakub Dawidek [TEMPORARY] module/os/freebsd/zfs/zfs_ctldir.c (not updated in openzfs master): e2d997d1cbb9 zfs: add missing vop_fplookup_vexec assignments Mateusz Guzik module/os/freebsd/zfs/zfs_vfsops.c (not updated in openzfs master): 068913e4ba3d zfs: Add vfs.zfs.bclone_enabled sysctl. Pawel Jakub Dawidek [TEMPORARY] module/os/freebsd/zfs/zfs_vnops_os.c (not updated in openzfs master): eb1feadc201a zfs: fix null ap->a_fsizetd NULL pointer derefernce Martin Matuska d012836fb616 zfs: fix up EXDEV handling for clone_range Mateusz Guzik 20be1b4fc4b7 zfs: try to fallback early if can't do optimized copy Mateusz Guzik [OPTIMIZATION?] 182b21d46276 openzfs: adopt to the new vn_lock_pair() interface Konstantin Belousov [FREEBSD TRACKING] 46ac8f2e7d96 zfs: don't use zfs_freebsd_copy_file_range Mateusz Guzik 068913e4ba3d zfs: Add vfs.zfs.bclone_enabled sysctl. Pawel Jakub Dawidek [TEMPORARY] Warner's stand (loader) work caused by the import might be associated with more openzfs changes at some point, allowing for easily/directly avoiding use of "extra register sets" in the various boot loaders. === Mark Millard marklmi at yahoo.com
