git: a0c5d373435c - releng/14.0 - vfs cache: Drop known argument of internal cache_recalc_neg_min()

From: Mateusz Guzik <mjg_at_FreeBSD.org>
Date: Sat, 14 Oct 2023 01:09:01 UTC
The branch releng/14.0 has been updated by mjg:

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

commit a0c5d373435c88b4076485251b13dcae279f1655
Author:     Olivier Certner <olce.freebsd@certner.fr>
AuthorDate: 2023-09-22 21:25:41 +0000
Commit:     Mateusz Guzik <mjg@FreeBSD.org>
CommitDate: 2023-10-14 01:08:31 +0000

    vfs cache: Drop known argument of internal cache_recalc_neg_min()
    
    'ncnegminpct' is to be passed always, so just drop the unneeded parameter.
    
    Sponsored by:   The FreeBSD Foundation
    Reviewed by:    mjg
    
    Differential Revision: https://reviews.freebsd.org/D41763
    
    (cherry picked from commit 02ef039c284b8a7b1ea40f5f9a851a3cb6af5b31)
    (cherry picked from commit fc424de7e192bb33793ba1f7ed0c75b961809bf4)
    
    Approved by:    re (gjb)
---
 sys/kern/vfs_cache.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index bd9eac69bfcb..115d0bdd3993 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -985,10 +985,10 @@ SYSCTL_PROC(_vfs_cache, OID_AUTO, nchstats, CTLTYPE_OPAQUE | CTLFLAG_RD |
     "VFS cache effectiveness statistics");
 
 static void
-cache_recalc_neg_min(u_int val)
+cache_recalc_neg_min(void)
 {
 
-	neg_min = (ncsize * val) / 100;
+	neg_min = (ncsize * ncnegminpct) / 100;
 }
 
 static int
@@ -1007,7 +1007,7 @@ sysctl_negminpct(SYSCTL_HANDLER_ARGS)
 	if (val < 0 || val > 99)
 		return (EINVAL);
 	ncnegminpct = val;
-	cache_recalc_neg_min(val);
+	cache_recalc_neg_min();
 	return (0);
 }
 
@@ -2665,7 +2665,7 @@ nchinit(void *dummy __unused)
 	VFS_SMR_ZONE_SET(cache_zone_large_ts);
 
 	ncsize = desiredvnodes * ncsizefactor;
-	cache_recalc_neg_min(ncnegminpct);
+	cache_recalc_neg_min();
 	nchashtbl = nchinittbl(desiredvnodes * 2, &nchash);
 	ncbuckethash = cache_roundup_2(mp_ncpus * mp_ncpus) - 1;
 	if (ncbuckethash < 7) /* arbitrarily chosen to avoid having one lock */
@@ -2809,7 +2809,7 @@ cache_changesize(u_long newmaxvnodes)
 		}
 	}
 	ncsize = newncsize;
-	cache_recalc_neg_min(ncnegminpct);
+	cache_recalc_neg_min();
 	cache_changesize_set_new(new_nchashtbl, new_nchash);
 	cache_unlock_all_buckets();
 	cache_unlock_all_vnodes();