git: 51927c36b8a9 - stable/13 - cache: convert cache_fplookup_parse to void now that it always succeeds

Mateusz Guzik mjg at FreeBSD.org
Mon Feb 1 12:40:59 UTC 2021


The branch stable/13 has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=51927c36b8a9d789534258bfd94e0018ee96381f

commit 51927c36b8a9d789534258bfd94e0018ee96381f
Author:     Mateusz Guzik <mjg at FreeBSD.org>
AuthorDate: 2021-01-26 00:40:47 +0000
Commit:     Mateusz Guzik <mjg at 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)) {


More information about the dev-commits-src-branches mailing list