summaryrefslogtreecommitdiffstats
path: root/sys/vm
diff options
context:
space:
mode:
authoralc <alc@FreeBSD.org>2003-06-26 03:14:40 +0000
committeralc <alc@FreeBSD.org>2003-06-26 03:14:40 +0000
commit5cfe94b87517f83e86412e52ecfa3239af0f9d1c (patch)
treeb5e0a56600c77a3d66a7cb7060f84e04cd76b27b /sys/vm
parentf5eb833dbfc4fa84a845c743f3e7cd12f0c20395 (diff)
downloadFreeBSD-src-5cfe94b87517f83e86412e52ecfa3239af0f9d1c.zip
FreeBSD-src-5cfe94b87517f83e86412e52ecfa3239af0f9d1c.tar.gz
Modify vm_pageq_requeue() to handle a PQ_NONE page without dereferencing
a NULL pointer; remove some now unused code.
Diffstat (limited to 'sys/vm')
-rw-r--r--sys/vm/vm_pageq.c19
1 files changed, 5 insertions, 14 deletions
diff --git a/sys/vm/vm_pageq.c b/sys/vm/vm_pageq.c
index bca21fb..475616e 100644
--- a/sys/vm/vm_pageq.c
+++ b/sys/vm/vm_pageq.c
@@ -46,26 +46,17 @@ vm_pageq_init(void)
}
}
-static __inline struct vpgqueues *
-vm_pageq_aquire(int queue)
-{
- struct vpgqueues *vpq = NULL;
-
- if (queue != PQ_NONE) {
- vpq = &vm_page_queues[queue];
- }
- return (vpq);
-}
-
void
vm_pageq_requeue(vm_page_t m)
{
int queue = m->queue;
struct vpgqueues *vpq;
- vpq = vm_pageq_aquire(queue);
- TAILQ_REMOVE(&vpq->pl, m, pageq);
- TAILQ_INSERT_TAIL(&vpq->pl, m, pageq);
+ if (queue != PQ_NONE) {
+ vpq = &vm_page_queues[queue];
+ TAILQ_REMOVE(&vpq->pl, m, pageq);
+ TAILQ_INSERT_TAIL(&vpq->pl, m, pageq);
+ }
}
/*
OpenPOWER on IntegriCloud