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

Assert that the vm object's lock is held on entry to vm_page_grab(); remove

Browse Source 
code from this function that was needed when vm object locking was
incomplete.
This commit is contained in:
Alan Cox 2003-08-21 20:59:07 +00:00
parent deb2a95690
commit 0f132ba697
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/vm/vm_page.c
View File

@ -1437,13 +1437,9 @@ vm_page_t
vm_page_grab(vm_object_t object, vm_pindex_t pindex, int allocflags)
{
vm_page_t m;
int s, generation, is_object_locked;
int s, generation;
/*
* Remove is_object_locked after vm_object locking is finished.
*/
if (!(is_object_locked = VM_OBJECT_LOCKED(object)))
GIANT_REQUIRED;
VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
retrylookup:
if ((m = vm_page_lookup(object, pindex)) != NULL) {
vm_page_lock_queues();
@ -1454,11 +1450,9 @@ vm_page_grab(vm_object_t object, vm_pindex_t pindex, int allocflags)
while ((object->generation == generation) &&
(m->busy || (m->flags & PG_BUSY))) {
vm_page_flag_set(m, PG_WANTED | PG_REFERENCED);
if (is_object_locked)
VM_OBJECT_UNLOCK(object);
VM_OBJECT_UNLOCK(object);
msleep(m, &vm_page_queue_mtx, PDROP | PVM, "pgrbwt", 0);
if (is_object_locked)
VM_OBJECT_LOCK(object);
VM_OBJECT_LOCK(object);
if ((allocflags & VM_ALLOC_RETRY) == 0) {
splx(s);
return NULL;
@ -1479,11 +1473,9 @@ vm_page_grab(vm_object_t object, vm_pindex_t pindex, int allocflags)
m = vm_page_alloc(object, pindex, allocflags & ~VM_ALLOC_RETRY);
if (m == NULL) {
if (is_object_locked)
VM_OBJECT_UNLOCK(object);
VM_OBJECT_UNLOCK(object);
VM_WAIT;
if (is_object_locked)
VM_OBJECT_LOCK(object);
VM_OBJECT_LOCK(object);
if ((allocflags & VM_ALLOC_RETRY) == 0)
return NULL;
goto retrylookup;