system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-06 09:10:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Validate the page in one place, dev_pager_getpages(), rather than doing it

Browse source 
in two places, dev_pager_getfake() and dev_pager_updatefake().

Compare a pointer to "NULL" rather than "0".
This commit is contained in:
Alan Cox 2009-06-22 19:09:48 +00:00
parent 3952a5abc9
commit ce1b857f33
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=194642
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sys/vm/device_pager.c
View file

@ -194,7 +194,7 @@ dev_pager_dealloc(object)
/*
* Free up our fake pages.
*/
while ((m = TAILQ_FIRST(&object->un_pager.devp.devp_pglist)) != 0) {
while ((m = TAILQ_FIRST(&object->un_pager.devp.devp_pglist)) != NULL) {
TAILQ_REMOVE(&object->un_pager.devp.devp_pglist, m, pageq);
dev_pager_putfake(m);
}
@ -219,7 +219,8 @@ dev_pager_getpages(object, m, count, reqpage)
VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
dev = object->handle;
offset = m[reqpage]->pindex;
page = m[reqpage];
offset = page->pindex;
VM_OBJECT_UNLOCK(object);
csw = dev_refthread(dev);
if (csw == NULL)
@ -234,13 +235,13 @@ dev_pager_getpages(object, m, count, reqpage)
td->td_fpop = fpop;
dev_relthread(dev);
if ((m[reqpage]->flags & PG_FICTITIOUS) != 0) {
if ((page->flags & PG_FICTITIOUS) != 0) {
/*
* If the passed in reqpage page is a fake page, update it with
* the new physical address.
*/
VM_OBJECT_LOCK(object);
dev_pager_updatefake(m[reqpage], paddr);
dev_pager_updatefake(page, paddr);
if (count > 1) {
vm_page_lock_queues();
for (i = 0; i < count; i++) {
@ -264,7 +265,7 @@ dev_pager_getpages(object, m, count, reqpage)
vm_page_insert(page, object, offset);
m[reqpage] = page;
}
page->valid = VM_PAGE_BITS_ALL;
return (VM_PAGER_OK);
}
@ -308,7 +309,6 @@ dev_pager_getfake(paddr)
m->flags = PG_FICTITIOUS;
m->oflags = VPO_BUSY;
/* Fictitious pages don't use "act_count". */
m->valid = VM_PAGE_BITS_ALL;
m->dirty = 0;
m->busy = 0;
m->queue = PQ_NONE;
@ -338,5 +338,4 @@ dev_pager_updatefake(m, paddr)
if (!(m->flags & PG_FICTITIOUS))
panic("dev_pager_updatefake: bad page");
m->phys_addr = paddr;
m->valid = VM_PAGE_BITS_ALL;
}