From nobody Fri Sep 22 21:51:13 2023 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 4RsmDf36b1z4tTjx; Fri, 22 Sep 2023 21:51:14 +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 4RsmDf2NW7z3PT4; Fri, 22 Sep 2023 21:51:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695419474; 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=Hin0C+sxTZTktiGNFXZD2CKlxK3aST+lrxB0ftLSC/c=; b=eWwb40ebVK6/OrPaM8HTU88qld+7FrgOuvIE+gv/kc76gp8A0X0lnbVOWMjxEIwixdzxQd 2iDD0IxibP/SLpgwI93+nVg5Pi6YW9SnVWXOJ3GhifaR3P/LcDsq1OhJexiNi80UAfU7Ym WzQazbOhlRrAszCECpZleTl+Rq9oXYaSa7oIjs+oioX0AMDHVdZguIHm8/4TcYCJ/aMK0F 2XdSf4zlRjD/6NTa0cRzVlVRe04pOhiw1GrjSleyEPkLHb39orMRCh8f5JC8N/HZfg1TXy plp1eAiYRQH6cz5u4UOIUo9ftkb6WuGGa/1FJo6zO2iEqzMDbtKqNjwU8X63IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695419474; a=rsa-sha256; cv=none; b=edUR1BuaaFF76hSqFgPuAxPA1jFJDkUi/RQRHe7VqjI94/Sr8wk6Y/HtZ1JsAG7U1km4n6 gg8YnQZcWU7E3ibVl/bmARlL+ks5gfZaSWhAS0vysDzTJt7UMIz46mJVF0IhIpNeJFHMk7 tPk7edbNqB/BWdSWdEk5ahVRtbzwcNQWmyuiE0Nmy/bPcFdaSr/996M0tOQznGYvpN/HDx luDdgiI/6rdpJT4IUMRFd77DxAsSdApJHZcwHWDLtizMOxKNlcG+1baNDtdrc8A0W6K86J HOSuuko8ytl7lxbRc/ribBQ+ioq+yNUNF4qOJGI5KV/5VyRsAIZeo8br4wlNvw== 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=1695419474; 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=Hin0C+sxTZTktiGNFXZD2CKlxK3aST+lrxB0ftLSC/c=; b=CpRizozdjbLKtGSsOKCyDQGkbwjJ/JRjE0QV+uDm+Pl3irVClz9Tpzn3QUxKnuFGidu4LG OsxNKdMutuHWYNWxhgcuGieZ+8p8wZvYh+v3VCuoAwDEuInc65A+jjf7N1bdFGipKvKF+R GpZuYGHHnvPQjVAgnN33O1NvBB5+QjR+Ijw6QsjkGDm+KMQfdfECSIZ2lwrwhJCeR9l2Z2 ZgZIlxk8E26F8Cw/ItkmvgBiD5sFHqYMKULJHGca5YqvMRcrLqI6IXM6/L2PKmMkUpZ0A8 U0tKLi7MRmCbl7/kSluROe7hB6b1dXdPd/i/CuZpExEfaDGShYakcP26pVn26A== 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 4RsmDd2dWPzdvF; Fri, 22 Sep 2023 21:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38MLpD0f039131; Fri, 22 Sep 2023 21:51:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MLpDFP039128; Fri, 22 Sep 2023 21:51:13 GMT (envelope-from git) Date: Fri, 22 Sep 2023 21:51:13 GMT Message-Id: <202309222151.38MLpDFP039128@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: 25d8cf225ac2 - stable/14 - ufs: restore name cache fast path lookup 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 25d8cf225ac29bb450bf52866aa6d169b9193178 Auto-Submitted: auto-generated The branch stable/14 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=25d8cf225ac29bb450bf52866aa6d169b9193178 commit 25d8cf225ac29bb450bf52866aa6d169b9193178 Author: Mateusz Guzik AuthorDate: 2023-09-09 21:48:57 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-22 21:50:46 +0000 ufs: restore name cache fast path lookup Found by: dchagin Fixes: f3c81b973897 ("ufs: add missing vop_fplookup ops") (cherry picked from commit a87c6962affc2d1994d8f30806c934eb4cb7af22) --- sys/ufs/ffs/ffs_vnops.c | 6 ++++-- sys/ufs/ufs/ufs_vnops.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 0dd64f696e0c..2b11a15c46c9 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -135,6 +135,8 @@ static vop_setextattr_t ffs_setextattr; static vop_vptofh_t ffs_vptofh; static vop_vput_pair_t ffs_vput_pair; +vop_fplookup_vexec_t ufs_fplookup_vexec; + /* Global vfs data structures for ufs. */ struct vop_vector ffs_vnodeops1 = { .vop_default = &ufs_vnodeops, @@ -151,7 +153,7 @@ struct vop_vector ffs_vnodeops1 = { .vop_write = ffs_write, .vop_vptofh = ffs_vptofh, .vop_vput_pair = ffs_vput_pair, - .vop_fplookup_vexec = VOP_EAGAIN, + .vop_fplookup_vexec = ufs_fplookup_vexec, .vop_fplookup_symlink = VOP_EAGAIN, }; VFS_VOP_VECTOR_REGISTER(ffs_vnodeops1); @@ -192,7 +194,7 @@ struct vop_vector ffs_vnodeops2 = { .vop_setextattr = ffs_setextattr, .vop_vptofh = ffs_vptofh, .vop_vput_pair = ffs_vput_pair, - .vop_fplookup_vexec = VOP_EAGAIN, + .vop_fplookup_vexec = ufs_fplookup_vexec, .vop_fplookup_symlink = VOP_EAGAIN, }; VFS_VOP_VECTOR_REGISTER(ffs_vnodeops2); diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index a7d5e8ba96fc..79cca75fc563 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -101,7 +101,7 @@ VFS_SMR_DECLARE; #include static vop_accessx_t ufs_accessx; -static vop_fplookup_vexec_t ufs_fplookup_vexec; +vop_fplookup_vexec_t ufs_fplookup_vexec; static int ufs_chmod(struct vnode *, int, struct ucred *, struct thread *); static int ufs_chown(struct vnode *, uid_t, gid_t, struct ucred *, struct thread *); @@ -475,7 +475,7 @@ ufs_accessx( * VOP_FPLOOKUP_VEXEC routines are subject to special circumstances, see * the comment above cache_fplookup for details. */ -static int +int ufs_fplookup_vexec( struct vop_fplookup_vexec_args /* { struct vnode *a_vp;