summaryrefslogtreecommitdiff
path: root/sys/vm
diff options
context:
space:
mode:
authorAlan Cox <alc@FreeBSD.org>2003-06-25 04:53:56 +0000
committerAlan Cox <alc@FreeBSD.org>2003-06-25 04:53:56 +0000
commitdd5e55f872bfe126b7779e482bb53eea0687eae9 (patch)
treedebbe2e844a590b9c853c6ea8b6927100049a48f /sys/vm
parentba10c47105954ce0bfb13fa8eea550a1ec206ba2 (diff)
Notes
Diffstat (limited to 'sys/vm')
-rw-r--r--sys/vm/swap_pager.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 763f237d011e..f6ca7c7ef205 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -1701,10 +1701,8 @@ swp_pager_force_pagein(struct swblock *swap, int idx)
VM_OBJECT_LOCK(object);
vm_object_pip_add(object, 1);
- VM_OBJECT_UNLOCK(object);
m = vm_page_grab(object, pindex + idx, VM_ALLOC_NORMAL|VM_ALLOC_RETRY);
if (m->valid == VM_PAGE_BITS_ALL) {
- VM_OBJECT_LOCK(object);
vm_object_pip_subtract(object, 1);
VM_OBJECT_UNLOCK(object);
vm_page_lock_queues();
@@ -1719,7 +1717,6 @@ swp_pager_force_pagein(struct swblock *swap, int idx)
if (swap_pager_getpages(object, &m, 1, 0) !=
VM_PAGER_OK)
panic("swap_pager_force_pagein: read from swap failed");/*XXX*/
- VM_OBJECT_LOCK(object);
vm_object_pip_subtract(object, 1);
VM_OBJECT_UNLOCK(object);