From nobody Fri Feb 11 13:58:07 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 90FB319B08C3; Fri, 11 Feb 2022 13:58: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JwFZ73HcKz3shH; Fri, 11 Feb 2022 13:58:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644587887; 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=LHL8vqdo+1JOB6Uroh9kE6rJ9OALeEx14zprNVSDzZA=; b=yjl2XG5xoTxZFvQanVE+5p3JALgdWyTii1WtJZPhlxeWxD9jRavdC2S/se3dqNyTslQC1r EQ5lvTjTAR06XvUbB4hLdrENS2HTabzL6wXWm7PV7KWw5ZefSiTQoYDHsFnIDkpkZJufwx kB7Q7TWoNlQ/VXPpQLTEYkXvNIiXGj5AOX+z/T6Ro/hRJ4s+e2gOrac3E/tjuaUDwD68/8 wm9eKwKUS6PJ4BAxq4Ss8eF1CUA8LjrazZkLkbecTWdK9AazFT8FfYmjCGjfwXnOgtecnK rGmP4yzW/eUsMPj4Nvh6/8TBOP8r2CAXyt2em5TlagB6WDqMcPqy2O5n+DMVHA== 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 40730150DB; Fri, 11 Feb 2022 13:58:07 +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 21BDw7Sj093209; Fri, 11 Feb 2022 13:58:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21BDw79g093208; Fri, 11 Feb 2022 13:58:07 GMT (envelope-from git) Date: Fri, 11 Feb 2022 13:58:07 GMT Message-Id: <202202111358.21BDw79g093208@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: 611470a51560 - main - cache: remove NOCACHE handling from cache_fplookup_noentry 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/main X-Git-Reftype: branch X-Git-Commit: 611470a51560db61488b2d864176b8076eb5a65c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644587887; 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=LHL8vqdo+1JOB6Uroh9kE6rJ9OALeEx14zprNVSDzZA=; b=AwmKjPp6t1xJ2cbNBWMAjlcIik0o41mZn711XYtst8OCJk5kHeOx7zGP5t8mNHhZDHVQWh Wnf1EpV8WpqqSF4GqQYQZ/iOuSd2sTKpa65aaQHIWPZgRhq/bCZ39feQKhXiOcnNaQ8oZk +dJZwPom8xa0dseL5wUNyG3l2qXl02d3E5jdyk7u+VAMVI6Hsrv5MGFozz3gzLvwWTPoHJ ql7BJ5BMX+v27Y+PVOzPKIjpJ8lkvGf0Eybbfgrs1mYxXBUvDquFLDcOUcdl09Y9xTw1Lw lcsPilXKztaDHzQ9kq5Dy2EUH6XSPLMUoY3aQI3UgcYf6fXeL+BEYtzyL6hRag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644587887; a=rsa-sha256; cv=none; b=BRVLfJQTc6kRuzu5NJIbEGnTpdmr6Uuoq/XMwRtogOBMyHPlJI0wopGJ/wl/bMl72cnpaD wBAvFChCBh3UZzxLxInVO6f8VwmNbDDUWQGcMa1BIOwcxfHTtObvHiu9XWhQU7SiZRvtFb PmtT+hcz27TG+4k+j0omm73fZP0VMSVbrDElgGfeVkyhFnY1SOKDxsGAJrp2Uiu5/nAcNv JfdvtoMeV/tyRFV/LZi4QZKOmf+ziXWkA8xKQ/xZWd9143XhJEIF3AG0kauv9r0e/PvR9w yAPL/Pm9PdQhANWOF4/Qy1kLtjZ0rI26UIYzI883fyvZDAceXKrEaWYidt8ngA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=611470a51560db61488b2d864176b8076eb5a65c commit 611470a51560db61488b2d864176b8076eb5a65c Author: Mateusz Guzik AuthorDate: 2022-02-09 20:39:28 +0000 Commit: Mateusz Guzik CommitDate: 2022-02-11 12:29:26 +0000 cache: remove NOCACHE handling from cache_fplookup_noentry It was copy-pasted from locked lookup. As LOOKUP operation cannot have the flag set it was always ending up setting MAKEENTRY. --- sys/kern/vfs_cache.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index a34e0dad74a8..e4766194187f 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -4830,7 +4830,6 @@ cache_fplookup_noentry(struct cache_fpl *fpl) struct vnode *dvp, *tvp; seqc_t dvp_seqc; int error; - bool docache; ndp = fpl->ndp; cnp = fpl->cnp; @@ -4839,6 +4838,8 @@ cache_fplookup_noentry(struct cache_fpl *fpl) MPASS((cnp->cn_flags & MAKEENTRY) == 0); MPASS((cnp->cn_flags & ISDOTDOT) == 0); + if (cnp->cn_nameiop == LOOKUP) + MPASS((cnp->cn_flags & NOCACHE) == 0); MPASS(!cache_fpl_isdotdot(cnp)); /* @@ -4915,10 +4916,7 @@ cache_fplookup_noentry(struct cache_fpl *fpl) /* * TODO: provide variants which don't require locking either vnode. */ - cnp->cn_flags |= ISLASTCN; - docache = (cnp->cn_flags & NOCACHE) ^ NOCACHE; - if (docache) - cnp->cn_flags |= MAKEENTRY; + cnp->cn_flags |= ISLASTCN | MAKEENTRY; cnp->cn_lkflags = LK_SHARED; if ((cnp->cn_flags & LOCKSHARED) == 0) { cnp->cn_lkflags = LK_EXCLUSIVE;