svn commit: r354168 - stable/12/sys/kern
Konstantin Belousov
kib at FreeBSD.org
Wed Oct 30 07:54:35 UTC 2019
Author: kib
Date: Wed Oct 30 07:54:34 2019
New Revision: 354168
URL: https://svnweb.freebsd.org/changeset/base/354168
Log:
MFC r353930:
Fix undefined behavior.
Modified:
stable/12/sys/kern/vfs_subr.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/kern/vfs_subr.c
==============================================================================
--- stable/12/sys/kern/vfs_subr.c Wed Oct 30 04:00:44 2019 (r354167)
+++ stable/12/sys/kern/vfs_subr.c Wed Oct 30 07:54:34 2019 (r354168)
@@ -1244,7 +1244,7 @@ vnlru_proc(void)
{
struct mount *mp, *nmp;
unsigned long onumvnodes;
- int done, force, trigger, usevnodes;
+ int done, force, trigger, usevnodes, vsp;
bool reclaim_nc_src;
EVENTHANDLER_REGISTER(shutdown_pre_sync, kproc_shutdown, vnlruproc,
@@ -1272,7 +1272,8 @@ vnlru_proc(void)
force = 1;
vstir = 0;
}
- if (vspace() >= vlowat && force == 0) {
+ vsp = vspace();
+ if (vsp >= vlowat && force == 0) {
vnlruproc_sig = 0;
wakeup(&vnlruproc_sig);
msleep(vnlruproc, &vnode_free_list_mtx,
@@ -1339,7 +1340,8 @@ vnlru_proc(void)
* After becoming active to expand above low water, keep
* active until above high water.
*/
- force = vspace() < vhiwat;
+ vsp = vspace();
+ force = vsp < vhiwat;
}
}
@@ -1416,8 +1418,10 @@ vtryrecycle(struct vnode *vp)
static void
vcheckspace(void)
{
+ int vsp;
- if (vspace() < vlowat && vnlruproc_sig == 0) {
+ vsp = vspace();
+ if (vsp < vlowat && vnlruproc_sig == 0) {
vnlruproc_sig = 1;
wakeup(vnlruproc);
}
More information about the svn-src-stable-12
mailing list