Author: markj
Date: Mon Feb 25 15:50:28 2019
New Revision: 344520
URL: https://svnweb.freebsd.org/changeset/base/344520
Log:
MFC r344231, r344440:
Remove a redundant flag variable.
Modified:
stable/12/sys/vm/vm_pageout.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/vm/vm_pageout.c
==============================================================================
--- stable/12/sys/vm/vm_pageout.c Mon Feb 25 15:47:22 2019
(r344519)
+++ stable/12/sys/vm/vm_pageout.c Mon Feb 25 15:50:28 2019
(r344520)
@@ -695,10 +695,9 @@ vm_pageout_launder(struct vm_domain *vmd, int launder,
vm_page_t m, marker;
int act_delta, error, numpagedout, queue, starting_target;
int vnodes_skipped;
- bool obj_locked, pageout_ok;
+ bool pageout_ok;
mtx = NULL;
- obj_locked = false;
object = NULL;
starting_target = launder;
vnodes_skipped = 0;
@@ -760,22 +759,16 @@ recheck:
}
if (object != m->object) {
- if (obj_locked) {
+ if (object != NULL)
VM_OBJECT_WUNLOCK(object);
- obj_locked = false;
- }
object = m->object;
- }
- if (!obj_locked) {
if (!VM_OBJECT_TRYWLOCK(object)) {
mtx_unlock(mtx);
/* Depends on type-stability. */
VM_OBJECT_WLOCK(object);
- obj_locked = true;
mtx_lock(mtx);
goto recheck;
- } else
- obj_locked = true;
+ }
}
if (vm_page_busied(m))
@@ -897,16 +890,16 @@ free_page:
vnodes_skipped++;
}
mtx = NULL;
- obj_locked = false;
+ object = NULL;
}
}
if (mtx != NULL) {
mtx_unlock(mtx);
mtx = NULL;
}
- if (obj_locked) {
+ if (object != NULL) {
VM_OBJECT_WUNLOCK(object);
- obj_locked = false;
+ object = NULL;
}
vm_pagequeue_lock(pq);
vm_pageout_end_scan(&ss);
@@ -1368,7 +1361,6 @@ vm_pageout_scan_inactive(struct vm_domain *vmd, int sh
vm_object_t object;
int act_delta, addl_page_shortage, deficit, page_shortage;
int starting_page_shortage;
- bool obj_locked;
/*
* The addl_page_shortage is an estimate of the number of temporarily
@@ -1388,7 +1380,6 @@ vm_pageout_scan_inactive(struct vm_domain *vmd, int sh
starting_page_shortage = page_shortage = shortage + deficit;
mtx = NULL;
- obj_locked = false;
object = NULL;
vm_batchqueue_init(&rq);
@@ -1446,22 +1437,16 @@ recheck:
}
if (object != m->object) {
- if (obj_locked) {
+ if (object != NULL)
VM_OBJECT_WUNLOCK(object);
- obj_locked = false;
- }
object = m->object;
- }
- if (!obj_locked) {
if (!VM_OBJECT_TRYWLOCK(object)) {
mtx_unlock(mtx);
/* Depends on type-stability. */
VM_OBJECT_WLOCK(object);
- obj_locked = true;
mtx_lock(mtx);
goto recheck;
- } else
- obj_locked = true;
+ }
}
if (vm_page_busied(m)) {
@@ -1563,14 +1548,10 @@ free_page:
reinsert:
vm_pageout_reinsert_inactive(&ss, &rq, m);
}
- if (mtx != NULL) {
+ if (mtx != NULL)
mtx_unlock(mtx);
- mtx = NULL;
- }
- if (obj_locked) {
+ if (object != NULL)
VM_OBJECT_WUNLOCK(object);
- obj_locked = false;
- }
vm_pageout_reinsert_inactive(&ss, &rq, NULL);
vm_pageout_reinsert_inactive(&ss, &ss.bq, NULL);
vm_pagequeue_lock(pq);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
