Page MenuHomeFreeBSD
Files F157545862

D56950.id.diff
No OneTemporary
Actions

D56950.id.diff
View Options

diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1775,7 +1775,7 @@
static void
vnlru_proc(void)
{
- u_long rnumvnodes, rfreevnodes, target;
+ u_long rnumvnodes, target;
unsigned long onumvnodes;
int done, force, trigger, usevnodes;
bool reclaim_nc_src, want_reread;
@@ -1824,7 +1824,6 @@
vnlru_proc_sleep();
continue;
}
- rfreevnodes = vnlru_read_freevnodes();
onumvnodes = rnumvnodes;
/*
@@ -1833,14 +1832,7 @@
* The trigger point is to avoid recycling vnodes with lots
* of resident pages. We aren't trying to free memory; we
* are trying to recycle or at least free vnodes.
- */
- if (rnumvnodes <= desiredvnodes)
- usevnodes = rnumvnodes - rfreevnodes;
- else
- usevnodes = rnumvnodes;
- if (usevnodes <= 0)
- usevnodes = 1;
- /*
+ *
* The trigger value is chosen to give a conservatively
* large value to ensure that it alone doesn't prevent
* making progress. The value can easily be so large that
@@ -1848,9 +1840,18 @@
* misconfigured cases, and this is necessary. Normally
* it is about 8 to 100 (pages), which is quite large.
*/
- trigger = vm_cnt.v_page_count * 2 / usevnodes;
- if (force < 2)
+ if (force < 2) {
trigger = vsmalltrigger;
+ } else {
+ if (rnumvnodes <= desiredvnodes)
+ usevnodes = rnumvnodes -
+ vnlru_read_freevnodes();
+ else
+ usevnodes = rnumvnodes;
+ if (usevnodes <= 0)
+ usevnodes = 1;
+ trigger = vm_cnt.v_page_count * 2 / usevnodes;
+ }
reclaim_nc_src = force >= 3;
target = rnumvnodes * (int64_t)gapvnodes / imax(desiredvnodes, 1);
target = target / 10 + 1;

File Metadata

Mime Type
text/plain
Expires
Sat, May 23, 4:28 PM (28 m, 45 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33022399
Default Alt Text
D56950.id.diff (1 KB)

Event Timeline