From nobody Wed Aug 14 16:06:50 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 4WkY6L5HlTz5SP0S; Wed, 14 Aug 2024 16:06:50 +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 4WkY6L3Jn5z51pq; Wed, 14 Aug 2024 16:06:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723651610; 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=asi22Un2pIjyVvBAN4qj4efhRD1p8gIx2bO/RTusuqU=; b=yAaXXcRUYvbd/RlFezeP/EgVR/11mm7Y25PKRzjCsYJiacaD9o+vcs0TbGSV8nR1JPZ6JG dNzrA6Bae2ZNZdP6oY61s4dC7v4Zk5cKV1cmbW8ZoDG8PYsF/KmoKX4qiQ+Zz0i8tLhzq6 sKsvQF52I+PfOOr5VdHHPzSTSwlZknm2j4UhCbTSIir6OYERBb8WyXKLnkNCs95+y3c0yx 7aZeM9jgf7csv5pnHnbqaXhFokzVWj5sg/7UlHYHmnogepPYVAc6YQsRjem6+1plIhQPbz blSR9QEYyATEnywyfE3W2IEr6XObrsxCcV4UWJ/CANLg5LPEK1+RkktoDfHWlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723651610; a=rsa-sha256; cv=none; b=W1nYQ12MB+H8huU9NF7ZC1psoWcYZGKscb5Px609wRB0NHu6n6C1oucKSOajRUOnsDsFKg En25xUFy9FmHHn5zrCgyNspi5ptWNwK7nqsAPCEZtXPtKjFeHI+cMzIlY6Z/5afoH9zfOM o11fuSS0/hTDnJsLdWJmcp7+ZIFRdbPannOP3ahctY4GkB6CnOK07UsyTXsB+VBXqa9n/1 oty3GCjwKND/xMBFQ79oQPEtGy9iGSx4zCL6QTod9o6G3r4uPLmM7HetIuG6O9/rgTMa59 2hkM32MglCFw1e/WxYwTYrEzd6HLxQmS6lQ7/U+hRreBrheacT8Gyy7E5I08Cw== 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=1723651610; 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=asi22Un2pIjyVvBAN4qj4efhRD1p8gIx2bO/RTusuqU=; b=CpjisFQ/j18TO/IaiN5xMM+Wt2hBxc5fFo2mjuBisMB047Dn1Zkc9RPSiLKLRULEkfG3jt f3i3yfFmdqVGF22oTytFdP1wIWYGDMJY1iuLFWI6/BLtl6j7wtO+SIe1t2o1yidcMR7qS5 ld3PZXNmhgl56wFvZBYgLO0BuMU41O/LNn3TjQUT7z+gNUM/1SwVevlYCyTEPcuRmgWRPN qR6uXdhSnRsSRVeNbmqo2UfUHq5PpHDzCuZMcpS+J1Pxr65jiJL2Xo+Da0JpFlflLBYWsh M0tFxT4IQZRzMrKJbLRtr3/DVD0QIACeNgjqmMtrLmE3nLS0zdl3gxHfikaBnA== 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 4WkY6L2tmbz1181; Wed, 14 Aug 2024 16:06:50 +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 47EG6o6M042701; Wed, 14 Aug 2024 16:06:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47EG6oY9042698; Wed, 14 Aug 2024 16:06:50 GMT (envelope-from git) Date: Wed, 14 Aug 2024 16:06:50 GMT Message-Id: <202408141606.47EG6oY9042698@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: b458ddf27fd8 - main - 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b458ddf27fd87afa57575cdad68f6b4183916666 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=b458ddf27fd87afa57575cdad68f6b4183916666 commit b458ddf27fd87afa57575cdad68f6b4183916666 Author: Gleb Smirnoff AuthorDate: 2024-08-14 16:06:31 +0000 Commit: Gleb Smirnoff CommitDate: 2024-08-14 16:06:31 +0000 zfs: fix build without MAC --- 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 8185954b3e05..d3be13abc682 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 @@ -6125,7 +6125,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);