From 2099bdfdedd2330df8b97790f4fe7d9a4275fa71 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 26 Jun 2003 03:14:40 +0000 Subject: [PATCH] Modify vm_pageq_requeue() to handle a PQ_NONE page without dereferencing a NULL pointer; remove some now unused code. --- sys/vm/vm_pageq.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/sys/vm/vm_pageq.c b/sys/vm/vm_pageq.c index bca21fb2044..475616e9ca6 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); + } } /* -- 2.45.2