The branch releng/13.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=210991b1f28bfebfff889252445e4fe41b714c7d
commit 210991b1f28bfebfff889252445e4fe41b714c7d Author: Martin Matuška <[email protected]> AuthorDate: 2021-11-15 16:07:39 +0000 Commit: Mark Johnston <[email protected]> CommitDate: 2022-03-15 20:52:41 +0000 FreeBSD: fix world build after de198f2d9 The inline function vn_flush_cached_data() in vnode.h must not be compiled when building BASE. Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Ryan Moeller <[email protected]> Reviewed-by: Allan Jude <[email protected]> Signed-off-by: Martin Matuska <[email protected]> Closes #12743 (cherry picked from commit b8dcfb2c9ff35fabcfe9dffa58278c7e14b18088) Approved by: so --- sys/contrib/openzfs/include/os/freebsd/spl/sys/vnode.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/vnode.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/vnode.h index 55491da54604..258267698781 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/vnode.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/vnode.h @@ -91,6 +91,7 @@ vn_is_readonly(vnode_t *vp) ((vp)->v_object != NULL && \ (vp)->v_object->resident_page_count > 0) +#ifndef IN_BASE static __inline void vn_flush_cached_data(vnode_t *vp, boolean_t sync) { @@ -105,6 +106,7 @@ vn_flush_cached_data(vnode_t *vp, boolean_t sync) zfs_vmobject_wunlock(vp->v_object); } } +#endif #define vn_exists(vp) do { } while (0) #define vn_invalid(vp) do { } while (0)
