From nobody Thu Sep 12 07:02:08 2024 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 4X47fS6kmlz5V3sH; Thu, 12 Sep 2024 07:02:08 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X47fS2pF3z4PcM; Thu, 12 Sep 2024 07:02:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726124528; 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=8uHKocotPqjq8ij1ZVXk+Dh8Ppumw29k/9qGqX7hvqQ=; b=LLY9AJvq5Eh2ochBN3zFgPdvvv+5kahzvyecN22JpNMWc/rqQ+aKrk9bXnnciaiW9TNvsG 8HqdaZX4KoVEGVhOIzZ68wlDbDCNCXKmdbkY5ePfkRGK5YJOR8Rs4KEAfb0cxKVyzBvDCA g/orDfvuSv7JsS5fmfZaYNi03Mx0oycAIryBRinc9Mu34IamlSRdDEDSEE81UXrlYxqBD5 ElPVjeF+Mw1kAFQ6VEtx7w4pLlGrGe7TXKfLYqvpixKS9ioWLCoPtTgIpNutK71rkL0C/Q SVOjowpuX2kf+frO2bNnTBXFJEYLpIOw3UjNNE49DQRplnIj6NnXeYWP4Fr04Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726124528; a=rsa-sha256; cv=none; b=Qc0vGNk18xjp7ax9hms4y1tCXIbmqDxW8JHhADugcE6CC2C063L3w0pYQ4h45WxZjTaIpQ 2tS7iOAcyxd1T8jNDLYImEL1cEjW2AsAolls2T6nfNU0//VCfWn8Il9KnNw3D5H/fkniCN HBPZaq0ahaIFzOKbVV0txTNV0yNjUYIAAzK9iQRkrqELTJcIXgwZdpU3R/Q9j0eKdayvzX F4MteamAlEyW6hcTkohyG4yK15agH226h9/ACP6aABhkezXJ8+LT1vGCRIVqPtnpuaCm5v /yWqCsTVd7+dRwvd+LGyWlnT599oBDvQJa2CYkR4vOw99nnxW+aSA8wYnMJcEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726124528; 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=8uHKocotPqjq8ij1ZVXk+Dh8Ppumw29k/9qGqX7hvqQ=; b=jckNO9onoMb++7tcmf6UWZrNPcTiUHzPx3JYOXIPtDm64PrEQktKHZHCqTRj47OW5QtrKs h+pG+iTmv7674v40juOAOK5Z8p5vdZwTNU4Gwi+oasUUV4iBwIXhqVkvouc0840QhPK2L7 KFn2EkSdiqCh6kN/5V2S8XgOCWouGxPvX02qPRsXcWvsfgr1mybKqjfRaEKvI+2EkFWXGc oSjsE+7pJBnBXuktsDHSad9LaJ263605U2kFyO1fOLsp0ZBs30TASvKvJR0Qqb5r45Jwe2 usnJsHbm3H8MyiFMIPdiDZaygMITpQhh9Ida2fDkVmcW3+DjcqQyCDVR4oB9jQ== 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 4X47fS2QVPz150L; Thu, 12 Sep 2024 07:02:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48C728wQ086982; Thu, 12 Sep 2024 07:02:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48C728NI086979; Thu, 12 Sep 2024 07:02:08 GMT (envelope-from git) Date: Thu, 12 Sep 2024 07:02:08 GMT Message-Id: <202409120702.48C728NI086979@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 4fe752ccb3f8 - stable/14 - zfs: fix build without MAC 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4fe752ccb3f8faeecf747932d13b15fc774cc244 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4fe752ccb3f8faeecf747932d13b15fc774cc244 commit 4fe752ccb3f8faeecf747932d13b15fc774cc244 Author: Gleb Smirnoff AuthorDate: 2024-08-14 16:06:31 +0000 Commit: Colin Percival CommitDate: 2024-09-12 07:01:40 +0000 zfs: fix build without MAC (cherry picked from commit b458ddf27fd87afa57575cdad68f6b4183916666) --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index 715b0ee6419c..96ea560a1a85 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -6323,7 +6323,9 @@ zfs_freebsd_copy_file_range(struct vop_copy_file_range_args *ap) error == EOPNOTSUPP) goto bad_locked_fallback; *ap->a_lenp = (size_t)len; +#ifdef MAC out_locked: +#endif if (invp != outvp) VOP_UNLOCK(invp); VOP_UNLOCK(outvp);