From nobody Thu Apr 6 15:45:30 2023 X-Original-To: dev-commits-src-main@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 4Psm6f52VCz44VwC; Thu, 6 Apr 2023 15:45:30 +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 4Psm6f4XZxz4Prj; Thu, 6 Apr 2023 15:45:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680795930; 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=3MhiF0ha7ds91aZSDJu4x5USiYBwCXVCw26RLTI5cGA=; b=T2E94I0oMNymVuUmokPlEuXPFHW7WA0dvLtbv0vs80ea/gbkUCn4rGIMeXQmOxAEbfRWK3 Sy7N1Y1PvfCH7MHORM1coOtlSjOR0PEVBjWwIqn/i4pnbi6ngzfdJ7/vHWBa9we/ZKAbyA DKi36RGu4uVmZaxY2TtofcfnddiPomwYjd5/fKBokPCFUZM0YFD54+RzU1uyKg/f+gLOBh rbMrN/1yyemM42cW+1MtYH192iQSXpLpTXAMrt4cjjfkkJeB2WkUO9H4oBhoeVHe+oNSPB ZBbZICjR4tIPJOR4fYJQ18sRA//FhDtvhfjQPZQECYj6XApEKjlNzp8hl7Ix/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680795930; 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=3MhiF0ha7ds91aZSDJu4x5USiYBwCXVCw26RLTI5cGA=; b=xjqoTExHlA9dGoKLMWgZc1IO1O7JINvxJHvKv273LcnSyWxmE1QKJh+zqfDn2kXlIXTdz8 UhtA3onnBomeGSjlVHG7FFjQZXwb1nVLcbO27dE9iwgfyXLpPDjlB1egRVWO7HANiH3EQP IYczKBKWVt6z9S7ZVVRdmPPSs4Y2sL+B/8PTzhIbL5XIaTrypHi2WY26d7J2lkLiDFohOr 2F0127QZB6KKkQQLUEPhYrFbsEISrQP1Y0fTGT1Ik+4+WQGwRBFLSGhUpdIBXH9KZBBY8E P7NxHoCmkaAzC5VF95Ak6Rr8cgY/C4wm+d58brukUSVFOcmyPkjaZIWz1SesnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680795930; a=rsa-sha256; cv=none; b=OxI9S0qZxRDJOnnBI5DIoJopC8OIthdXEQlJ1Yet4f0UVyxrmaPJZfkZiZBXQ+oJvu2Wbt HJqbqrokSeULOupx60/xSDrMhIAMkl2dXta6MEZoz5PsMcIN/X6TJCcbkchbK6FBUKn4Rw 94Ac0+SdLLz9fEfVLsnamiliB6d2dAYkBPoFgBTbY5SN9IoKxb8gwwBw+LymqyMzt2QYRH av4qcJyCOmI/X2Rq+d8qmINDSX4L5hlR6SBlKpGbYc+zIBoMwjU9fHJpjRyVdOQuMTQywH 6H/XPCQnAzYY2xDIwHBCZCW2VM+rwXvW06uXh6yKNNLn1ersl4PZl9JExMsFiQ== 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 4Psm6f3Wv6z1923; Thu, 6 Apr 2023 15:45:30 +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 336FjUpa079511; Thu, 6 Apr 2023 15:45:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 336FjUdX079510; Thu, 6 Apr 2023 15:45:30 GMT (envelope-from git) Date: Thu, 6 Apr 2023 15:45:30 GMT Message-Id: <202304061545.336FjUdX079510@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: e2d997d1cbb9 - main - zfs: add missing vop_fplookup_vexec assignments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2d997d1cbb9b4d651bd35e7d16d316ecd0981ad Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=e2d997d1cbb9b4d651bd35e7d16d316ecd0981ad commit e2d997d1cbb9b4d651bd35e7d16d316ecd0981ad Author: Mateusz Guzik AuthorDate: 2021-11-03 20:25:01 +0000 Commit: Mateusz Guzik CommitDate: 2023-04-06 15:20:40 +0000 zfs: add missing vop_fplookup_vexec assignments This happens to be a nop right now. --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c index ca2f4419d1c4..d00efa44f2bc 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c @@ -801,6 +801,9 @@ static struct vop_vector zfsctl_ops_root = { .vop_default = &default_vnodeops, #if __FreeBSD_version >= 1300121 .vop_fplookup_vexec = VOP_EAGAIN, +#endif +#if __FreeBSD_version >= 1300139 + .vop_fplookup_symlink = VOP_EAGAIN, #endif .vop_open = zfsctl_common_open, .vop_close = zfsctl_common_close, @@ -1129,6 +1132,9 @@ static struct vop_vector zfsctl_ops_snapdir = { .vop_default = &default_vnodeops, #if __FreeBSD_version >= 1300121 .vop_fplookup_vexec = VOP_EAGAIN, +#endif +#if __FreeBSD_version >= 1300139 + .vop_fplookup_symlink = VOP_EAGAIN, #endif .vop_open = zfsctl_common_open, .vop_close = zfsctl_common_close, @@ -1236,6 +1242,9 @@ static struct vop_vector zfsctl_ops_snapshot = { .vop_default = NULL, /* ensure very restricted access */ #if __FreeBSD_version >= 1300121 .vop_fplookup_vexec = VOP_EAGAIN, +#endif +#if __FreeBSD_version >= 1300139 + .vop_fplookup_symlink = VOP_EAGAIN, #endif .vop_open = zfsctl_common_open, .vop_close = zfsctl_common_close,