diff options
| author | kib <kib@FreeBSD.org> | 2012-01-04 16:04:20 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2012-01-04 16:04:20 +0000 |
| commit | aec33a2b906973c3827248a3f5ee9e025f6d10f8 (patch) | |
| tree | 6ec4ba40df14c56c569e2c70f3bfd14227dc7148 /sys/vm | |
| parent | 0fa8414b70b850a771c5711596fe26b7f69ac306 (diff) | |
| download | FreeBSD-src-aec33a2b906973c3827248a3f5ee9e025f6d10f8.zip FreeBSD-src-aec33a2b906973c3827248a3f5ee9e025f6d10f8.tar.gz | |
Do not restart the scan in vm_object_page_clean() on the object
generation change if requested mode is async. The object generation is
only changed when the object is marked as OBJ_MIGHTBEDIRTY. For async
mode it is enough to write each dirty page, not to make a guarantee that
all pages are cleared after the vm_object_page_clean() returned.
Diagnosed by: truckman
Tested by: flo
Reviewed by: alc, truckman
MFC after: 2 weeks
Diffstat (limited to 'sys/vm')
| -rw-r--r-- | sys/vm/vm_object.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 716916f..1a8ce65 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -841,8 +841,12 @@ rescan: if (p->valid == 0) continue; if (vm_page_sleep_if_busy(p, TRUE, "vpcwai")) { - if (object->generation != curgeneration) - goto rescan; + if (object->generation != curgeneration) { + if ((flags & OBJPC_SYNC) != 0) + goto rescan; + else + clearobjflags = 0; + } np = vm_page_find_least(object, pi); continue; } @@ -851,8 +855,12 @@ rescan: n = vm_object_page_collect_flush(object, p, pagerflags, flags, &clearobjflags); - if (object->generation != curgeneration) - goto rescan; + if (object->generation != curgeneration) { + if ((flags & OBJPC_SYNC) != 0) + goto rescan; + else + clearobjflags = 0; + } /* * If the VOP_PUTPAGES() did a truncated write, so |
