d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The bits set in a page's dirty mask are a subset of the bits set in its

Browse Source 
valid mask.  Consequently, there is no need to perform a bit-wise and of
the page's dirty and valid masks in order to determine which parts of a
page are dirty and valid.

Eliminate an unnecessary #include.
This commit is contained in:
Alan Cox 2009-06-24 04:45:03 +00:00
parent f3bf5def20
commit 26f4eea53f
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/vm/vm_object.c
View File

@ -787,7 +787,7 @@ vm_object_page_clean(vm_object_t object, vm_pindex_t start, vm_pindex_t end, int
continue;
}
vm_page_test_dirty(p);
if ((p->dirty & p->valid) == 0) {
if (p->dirty == 0) {
if (--scanlimit == 0)
break;
++tscan;
@ -874,7 +874,7 @@ vm_object_page_clean(vm_object_t object, vm_pindex_t start, vm_pindex_t end, int
}
vm_page_test_dirty(p);
if ((p->dirty & p->valid) == 0) {
if (p->dirty == 0) {
p->oflags &= ~VPO_CLEANCHK;
continue;
}
@ -947,7 +947,7 @@ vm_object_page_collect_flush(vm_object_t object, vm_page_t p, int curgeneration,
(tp->busy != 0))
break;
vm_page_test_dirty(tp);
if ((tp->dirty & tp->valid) == 0) {
if (tp->dirty == 0) {
tp->oflags &= ~VPO_CLEANCHK;
break;
}
@ -971,7 +971,7 @@ vm_object_page_collect_flush(vm_object_t object, vm_page_t p, int curgeneration,
(tp->busy != 0))
break;
vm_page_test_dirty(tp);
if ((tp->dirty & tp->valid) == 0) {
if (tp->dirty == 0) {
tp->oflags &= ~VPO_CLEANCHK;
break;
}
@ -999,7 +999,7 @@ vm_object_page_collect_flush(vm_object_t object, vm_page_t p, int curgeneration,
vm_pageout_flush(ma, runlen, pagerflags);
for (i = 0; i < runlen; i++) {
if (ma[i]->valid & ma[i]->dirty) {
if (ma[i]->dirty) {
pmap_remove_write(ma[i]);
ma[i]->oflags |= VPO_CLEANCHK;
@ -1946,7 +1946,7 @@ vm_object_page_remove(vm_object_t object, vm_pindex_t start, vm_pindex_t end,
("vm_object_page_remove: page %p is fictitious", p));
if (clean_only && p->valid) {
pmap_remove_write(p);
if (p->valid & p->dirty)
if (p->dirty)
continue;
}
pmap_remove_all(p);

6
sys/vm/vm_pageout.c
View File

@ -105,8 +105,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_extern.h>
#include <vm/uma.h>
#include <machine/mutex.h>
/*
* System initialization
*/
@ -350,7 +348,7 @@ vm_pageout_clean(m)
break;
}
vm_page_test_dirty(p);
if ((p->dirty & p->valid) == 0 ||
if (p->dirty == 0 ||
p->queue != PQ_INACTIVE ||
p->wire_count != 0 || /* may be held by buf cache */
p->hold_count != 0) { /* may be undergoing I/O */
@ -378,7 +376,7 @@ vm_pageout_clean(m)
break;
}
vm_page_test_dirty(p);
if ((p->dirty & p->valid) == 0 ||
if (p->dirty == 0 ||
p->queue != PQ_INACTIVE ||
p->wire_count != 0 || /* may be held by buf cache */
p->hold_count != 0) { /* may be undergoing I/O */