From nobody Tue Mar 15 21:18:16 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E4D221A263DF; Tue, 15 Mar 2022 21:18:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KJ5qD3s8mz3LV4; Tue, 15 Mar 2022 21:18:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647379096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vEBjSlfDm4Zfev/55XCvzfZqoYAw/QQcbkU92t8FRwM=; b=oAoCbjGv9VW7TdmEjnnKMDQxmm87/GASvumR0zrsvXVcbr+bq4dK2oy0PP1f6I69YuSe3y SLbD2a5ZsZB/AoCTw4R3bK7AI/2aaT3t61pv242e1aFdva3q99PMIOOXx2YVLL1Urm+c2I ph6/YzX4RrXHzVOPO38L3uah3t+2IVKgbmSLvBMloAIfExscDFWHBfoBr0dWcvMVAGnhjX 0FUDIg5zagotMLLVQ9nhZwYuMIDxdp0ZDZbejQFuLgZ+OCC9PlMYenjTB1e6JmyndUeypa /htgZ+aMFtFzSM4Je3souXBUOWG2vTrFTh36cD+N6Vkyes4Dm3lzVzFs3U9tag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 61ED31242; Tue, 15 Mar 2022 21:18:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22FLIGMK019097; Tue, 15 Mar 2022 21:18:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FLIGwi019096; Tue, 15 Mar 2022 21:18:16 GMT (envelope-from git) Date: Tue, 15 Mar 2022 21:18:16 GMT Message-Id: <202203152118.22FLIGwi019096@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 210991b1f28b - releng/13.0 - FreeBSD: fix world build after de198f2d9 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.0 X-Git-Reftype: branch X-Git-Commit: 210991b1f28bfebfff889252445e4fe41b714c7d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647379096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vEBjSlfDm4Zfev/55XCvzfZqoYAw/QQcbkU92t8FRwM=; b=NA4ROZyIs5rS+TBT2QFTDCMyEPnuuUDmvU2iN7NnIsYMDz45uznwlD7LurAI/DJ1FMZFHg XHaUZq2saVIOAlm6i/Yx3Knrdd3ugJZL3LqOKju0z/Nu66hXXoIVLBXFaH0rPS/2RcsBS0 usSEi9Yw87c6fPbj1fBosJTQAeuYKL3+7Wbejf7q4HjIyK+3KkSwPw7I/Dg5lM32CMVgYk wopJfTxJ7KrWTefzk8DZ5Sx0POqg8BBPTGWYLRdSHRL7mXkELaRrXHbuauAPT++qTCBpL+ 9nx/4A/IuqqQ2+2TRaMk4u10yOnwklI1/OO89BHRTBTD3uTD5G08KGW0GvbR9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647379096; a=rsa-sha256; cv=none; b=gI4bSKIIjbCWlQVX/hvj4m5td16sYKR8Z1v38SWXgjzMyft5h7kwAXOGxa6X2See3F5BA5 xY/SN7KwTtGv6R23JX/l3dofpXGBEDyYFVHJnIiYPvDvOevOuFj1ezCbBvMDmxpeYpPzTd lXzia1B/wVEEeD6yPkNihL2gfSeVABEOHVlQYMayUjrWbJoJ3XfcikzVd5zzZ9jLVHtk5u aqLr0VZm5cScfU4493xEKGL5B8lUdy5mc7IMCr5WeBQOwgjHkZtqorCm1zF1U/FYiWiGRD EOpRKGILW8pq0/WOZmA17FQMwvz0aMHK6g0ojJ7zhNv3jT38FAfPBaNNlVRwtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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 AuthorDate: 2021-11-15 16:07:39 +0000 Commit: Mark Johnston 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 Reviewed-by: Ryan Moeller Reviewed-by: Allan Jude Signed-off-by: Martin Matuska 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)