From owner-dev-commits-src-branches@freebsd.org Mon Feb 1 12:40:59 2021
Return-Path: <owner-dev-commits-src-branches@freebsd.org>
Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 253604FE9EF;
Mon, 1 Feb 2021 12:40:59 +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 4DTncB1Vp7z3Dy2;
Mon, 1 Feb 2021 12:40:58 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 AB09B1B16B;
Mon, 1 Feb 2021 12:40:53 +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 111Cerrf097378;
Mon, 1 Feb 2021 12:40:53 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 111Cer6L097377;
Mon, 1 Feb 2021 12:40:53 GMT (envelope-from git)
Date: Mon, 1 Feb 2021 12:40:53 GMT
Message-Id: <202102011240.111Cer6L097377@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mateusz Guzik <mjg@FreeBSD.org>
Subject: git: 51927c36b8a9 - stable/13 - cache: convert cache_fplookup_parse
to void now that it always succeeds
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/13
X-Git-Reftype: branch
X-Git-Commit: 51927c36b8a9d789534258bfd94e0018ee96381f
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-branches@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the stable branches of the FreeBSD src repository
<dev-commits-src-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-branches/>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Help: <mailto:dev-commits-src-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Feb 2021 12:40:59 -0000
The branch stable/13 has been updated by mjg:
URL: https://cgit.FreeBSD.org/src/commit/?id=51927c36b8a9d789534258bfd94e0018ee96381f
commit 51927c36b8a9d789534258bfd94e0018ee96381f
Author: Mateusz Guzik <mjg@FreeBSD.org>
AuthorDate: 2021-01-26 00:40:47 +0000
Commit: Mateusz Guzik <mjg@FreeBSD.org>
CommitDate: 2021-02-01 12:39:17 +0000
cache: convert cache_fplookup_parse to void now that it always succeeds
(cherry picked from commit 6943671b481e571f2f1ffbe407a4d75241d1174e)
---
sys/kern/vfs_cache.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index a73e4843b5f3..72669449c26a 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -5178,7 +5178,7 @@ cache_fplookup_preparse(struct cache_fpl *fpl)
return (0);
}
-static int
+static void
cache_fplookup_parse(struct cache_fpl *fpl)
{
struct nameidata *ndp;
@@ -5241,7 +5241,6 @@ cache_fplookup_parse(struct cache_fpl *fpl)
panic("%s: ran into degenerate name from [%s]\n", __func__, cnp->cn_pnbuf);
}
#endif
- return (0);
}
static void
@@ -5426,10 +5425,7 @@ cache_fplookup_impl(struct vnode *dvp, struct cache_fpl *fpl)
}
for (;;) {
- error = cache_fplookup_parse(fpl);
- if (__predict_false(error != 0)) {
- break;
- }
+ cache_fplookup_parse(fpl);
error = VOP_FPLOOKUP_VEXEC(fpl->dvp, cnp->cn_cred);
if (__predict_false(error != 0)) {