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

zfs: catch up with vm_page_sleep_if_busy changes

Browse source 
Reviewed by:	alc
Approved by:	pjd
Tested by:	tools/regression/fsx
MFC after:	2 weeks
This commit is contained in:
Andriy Gapon 2010-09-15 10:39:21 +00:00
parent 7ed09cd535
commit fbbdb19dcd
1 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
View file

@ -323,8 +323,17 @@ page_lookup(vnode_t *vp, int64_t start, int64_t off, int64_t nbytes)
for (;;) {
if ((pp = vm_page_lookup(obj, OFF_TO_IDX(start))) != NULL &&
vm_page_is_valid(pp, (vm_offset_t)off, nbytes)) {
if (vm_page_sleep_if_busy(pp, FALSE, "zfsmwb"))
if ((pp->oflags & VPO_BUSY) != 0) {
/*
* Reference the page before unlocking and
* sleeping so that the page daemon is less
* likely to reclaim it.
*/
vm_page_lock_queues();
vm_page_flag_set(pp, PG_REFERENCED);
vm_page_sleep(pp, "zfsmwb");
continue;
}
vm_page_busy(pp);
vm_page_undirty(pp);
} else {
@ -451,8 +460,18 @@ mappedread(vnode_t *vp, int nbytes, uio_t *uio)
again:
if ((m = vm_page_lookup(obj, OFF_TO_IDX(start))) != NULL &&
vm_page_is_valid(m, (vm_offset_t)off, bytes)) {
if (vm_page_sleep_if_busy(m, FALSE, "zfsmrb"))
if ((m->oflags & VPO_BUSY) != 0) {
/*
* Reference the page before unlocking and
* sleeping so that the page daemon is less
* likely to reclaim it.
*/
vm_page_lock_queues();
vm_page_flag_set(m, PG_REFERENCED);
vm_page_sleep(m, "zfsmrb");
goto again;
}
vm_page_busy(m);
VM_OBJECT_UNLOCK(obj);
if (dirbytes > 0) {
@ -478,8 +497,17 @@ again:
* but it pessimize performance of sendfile/UFS, that's
* why I handle this special case in ZFS code.
*/
if (vm_page_sleep_if_busy(m, FALSE, "zfsmrb"))
if ((m->oflags & VPO_BUSY) != 0) {
/*
* Reference the page before unlocking and
* sleeping so that the page daemon is less
* likely to reclaim it.
*/
vm_page_lock_queues();
vm_page_flag_set(m, PG_REFERENCED);
vm_page_sleep(m, "zfsmrb");
goto again;
}
vm_page_busy(m);
VM_OBJECT_UNLOCK(obj);
if (dirbytes > 0) {