upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-11 01:30:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

o Lock page queue accesses by vm_page_free().

Browse source 
o Apply some style fixes.
This commit is contained in:
Alan Cox 2002-07-28 20:13:48 +00:00
parent 5c38b6dbce
commit e43c2eab07
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
sys/vm/vnode_pager.c
View file

@ -620,7 +620,7 @@ vnode_pager_generic_getpages(vp, m, bytecount, reqpage)
vm_object_t object;
vm_offset_t kva;
off_t foff, tfoff, nextoff;
int i, size, bsize, first, firstaddr;
int i, j, size, bsize, first, firstaddr;
struct vnode *dp;
int runpg;
int runend;
@ -650,11 +650,11 @@ vnode_pager_generic_getpages(vp, m, bytecount, reqpage)
* if we can't bmap, use old VOP code
*/
if (VOP_BMAP(vp, 0, &dp, 0, NULL, NULL)) {
for (i = 0; i < count; i++) {
if (i != reqpage) {
vm_page_lock_queues();
for (i = 0; i < count; i++)
if (i != reqpage)
vm_page_free(m[i]);
}
}
vm_page_unlock_queues();
cnt.v_vnodein++;
cnt.v_vnodepgsin++;
return vnode_pager_input_old(object, m[reqpage]);
@ -666,11 +666,11 @@ vnode_pager_generic_getpages(vp, m, bytecount, reqpage)
*/
} else if ((PAGE_SIZE / bsize) > 1 &&
(vp->v_mount->mnt_stat.f_type != nfs_mount_type)) {
for (i = 0; i < count; i++) {
if (i != reqpage) {
vm_page_lock_queues();
for (i = 0; i < count; i++)
if (i != reqpage)
vm_page_free(m[i]);
}
}
vm_page_unlock_queues();
cnt.v_vnodein++;
cnt.v_vnodepgsin++;
return vnode_pager_input_smlfs(object, m[reqpage]);
@ -682,10 +682,11 @@ vnode_pager_generic_getpages(vp, m, bytecount, reqpage)
* media.
*/
if (m[reqpage]->valid == VM_PAGE_BITS_ALL) {
for (i = 0; i < count; i++) {
vm_page_lock_queues();
for (i = 0; i < count; i++)
if (i != reqpage)
vm_page_free(m[i]);
}
vm_page_unlock_queues();
return VM_PAGER_OK;
}
m[reqpage]->valid = 0;
@ -712,21 +713,25 @@ vnode_pager_generic_getpages(vp, m, bytecount, reqpage)
(u_long)(u_int32_t)
object->un_pager.vnp.vnp_size);
}
vm_page_lock_queues();
vm_page_free(m[i]);
vm_page_unlock_queues();
runend = i + 1;
first = runend;
continue;
}
runend = i + runpg;
if (runend <= reqpage) {
int j;
for (j = i; j < runend; j++) {
vm_page_lock_queues();
for (j = i; j < runend; j++)
vm_page_free(m[j]);
}
vm_page_unlock_queues();
} else {
if (runpg < (count - first)) {
vm_page_lock_queues();
for (i = first + runpg; i < count; i++)
vm_page_free(m[i]);
vm_page_unlock_queues();
count = first + runpg;
}
break;