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

Several cleanups for the r209686:

Browse Source 
- remove unused defines;
- remove unused curgeneration argument for vm_object_page_collect_flush();
- always assert that vm_object_page_clean() is called for OBJT_VNODE;
- move vm_page_find_least() into for() statement initial clause.

Submitted by:	alc
This commit is contained in:
Konstantin Belousov 2010-07-04 19:02:32 +00:00
parent 34a39b7b1f
commit 757216f3a5
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/vm/vm_object.c
View File

@ -96,17 +96,13 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_reserv.h> #include <vm/vm_reserv.h>
#include <vm/uma.h> #include <vm/uma.h>
#define EASY_SCAN_FACTOR 8
#define MSYNC_FLUSH_HARDSEQ 0x01
#define MSYNC_FLUSH_SOFTSEQ 0x02
static int old_msync; static int old_msync;
SYSCTL_INT(_vm, OID_AUTO, old_msync, CTLFLAG_RW, &old_msync, 0, SYSCTL_INT(_vm, OID_AUTO, old_msync, CTLFLAG_RW, &old_msync, 0,
"Use old (insecure) msync behavior"); "Use old (insecure) msync behavior");
static int vm_object_page_collect_flush(vm_object_t object, vm_page_t p,
int pagerflags);
static void vm_object_qcollapse(vm_object_t object); static void vm_object_qcollapse(vm_object_t object);
static int vm_object_page_collect_flush(vm_object_t object, vm_page_t p, int curgeneration, int pagerflags);
static void vm_object_vndeallocate(vm_object_t object); static void vm_object_vndeallocate(vm_object_t object);
/* /*
@ -764,10 +760,10 @@ vm_object_page_clean(vm_object_t object, vm_pindex_t start, vm_pindex_t end,
mtx_assert(&vm_page_queue_mtx, MA_NOTOWNED); mtx_assert(&vm_page_queue_mtx, MA_NOTOWNED);
VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
KASSERT(object->type == OBJT_VNODE, ("Not a vnode object"));
if ((object->flags & OBJ_MIGHTBEDIRTY) == 0 || if ((object->flags & OBJ_MIGHTBEDIRTY) == 0 ||
object->resident_page_count == 0) object->resident_page_count == 0)
return; return;
KASSERT(object->type == OBJT_VNODE, ("Not a vnode object"));
pagerflags = (flags & (OBJPC_SYNC | OBJPC_INVAL)) != 0 ? pagerflags = (flags & (OBJPC_SYNC | OBJPC_INVAL)) != 0 ?
VM_PAGER_PUT_SYNC : VM_PAGER_CLUSTER_OK; VM_PAGER_PUT_SYNC : VM_PAGER_CLUSTER_OK;
@ -798,10 +794,9 @@ vm_object_page_clean(vm_object_t object, vm_pindex_t start, vm_pindex_t end,
vm_object_clear_flag(object, OBJ_MIGHTBEDIRTY); vm_object_clear_flag(object, OBJ_MIGHTBEDIRTY);
rescan: rescan:
p = vm_page_find_least(object, start);
curgeneration = object->generation; curgeneration = object->generation;
for (; p != NULL; p = np) { for (p = vm_page_find_least(object, start); p != NULL; p = np) {
pi = p->pindex; pi = p->pindex;
if (pi >= tend) if (pi >= tend)
break; break;
@ -825,8 +820,7 @@ rescan:
(p->oflags & VPO_NOSYNC) != 0) (p->oflags & VPO_NOSYNC) != 0)
continue; continue;
n = vm_object_page_collect_flush(object, p, n = vm_object_page_collect_flush(object, p, pagerflags);
curgeneration, pagerflags);
KASSERT(n > 0, ("vm_object_page_collect_flush failed")); KASSERT(n > 0, ("vm_object_page_collect_flush failed"));
if (object->generation != curgeneration) if (object->generation != curgeneration)
goto rescan; goto rescan;
@ -840,8 +834,7 @@ rescan:
} }
static int static int
vm_object_page_collect_flush(vm_object_t object, vm_page_t p, int curgeneration, vm_object_page_collect_flush(vm_object_t object, vm_page_t p, int pagerflags)
int pagerflags)
{ {
int runlen; int runlen;
int maxf; int maxf;