From 1e976481fe83f49ebcc6a33278b2b3148b3aeb0d Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Sun, 16 Oct 2005 00:28:04 +0000
Subject: [PATCH] avoid a goto.

---
 sys/kern/subr_pool.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c
index cfbe785840ca..41be776c245d 100644
--- a/sys/kern/subr_pool.c
+++ b/sys/kern/subr_pool.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_pool.c,v 1.103 2005/10/15 21:22:46 chs Exp $	*/
+/*	$NetBSD: subr_pool.c,v 1.104 2005/10/16 00:28:04 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1999, 2000 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.103 2005/10/15 21:22:46 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.104 2005/10/16 00:28:04 christos Exp $");
 
 #include "opt_pool.h"
 #include "opt_poollog.h"
@@ -2077,9 +2077,8 @@ pool_do_cache_invalidate(struct pool_cache *pc, struct pool_pagelist *pq,
 	LOCK_ASSERT(simple_lock_held(&pc->pc_slock));
 	LOCK_ASSERT(simple_lock_held(&pc->pc_pool->pr_slock));
 
-	for (pcg = LIST_FIRST(&pc->pc_fullgroups); pcg != NULL; pcg = npcg) {
-
-loop:
+	for (pcg = LIST_FIRST(&pc->pc_fullgroups); pcg != NULL;
+	    pcg = npcg ? npcg : LIST_FIRST(&pc->pc_partgroups)) {
 		npcg = LIST_NEXT(pcg, pcg_list);
 		while (pcg->pcg_avail != 0) {
 			pc->pc_nitems--;
@@ -2092,10 +2091,6 @@ loop:
 		LIST_REMOVE(pcg, pcg_list);
 		LIST_INSERT_HEAD(pcgl, pcg, pcg_list);
 	}
-	pcg = LIST_FIRST(&pc->pc_partgroups);
-	if (pcg != NULL) {
-		goto loop;
-	}
 
 	KASSERT(LIST_EMPTY(&pc->pc_partgroups));
 	KASSERT(LIST_EMPTY(&pc->pc_fullgroups));