From owner-svn-src-all@FreeBSD.ORG  Thu Mar 18 13:11:43 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 978391065670;
	Thu, 18 Mar 2010 13:11:43 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 875A38FC0A;
	Thu, 18 Mar 2010 13:11:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2IDBhKT031862;
	Thu, 18 Mar 2010 13:11:43 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2IDBhcw031860;
	Thu, 18 Mar 2010 13:11:43 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201003181311.o2IDBhcw031860@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Thu, 18 Mar 2010 13:11:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205279 - head/sys/geom/gate
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Mar 2010 13:11:43 -0000

Author: pjd
Date: Thu Mar 18 13:11:43 2010
New Revision: 205279
URL: http://svn.freebsd.org/changeset/base/205279

Log:
  Simplify loops.

Modified:
  head/sys/geom/gate/g_gate.c

Modified: head/sys/geom/gate/g_gate.c
==============================================================================
--- head/sys/geom/gate/g_gate.c	Thu Mar 18 11:53:32 2010	(r205278)
+++ head/sys/geom/gate/g_gate.c	Thu Mar 18 13:11:43 2010	(r205279)
@@ -109,27 +109,17 @@ g_gate_destroy(struct g_gate_softc *sc, 
 	g_orphan_provider(pp, ENXIO);
 	callout_drain(&sc->sc_callout);
 	mtx_lock(&sc->sc_queue_mtx);
-	for (;;) {
-		bp = bioq_first(&sc->sc_inqueue);
-		if (bp != NULL) {
-			bioq_remove(&sc->sc_inqueue, bp);
-			sc->sc_queue_count--;
-			G_GATE_LOGREQ(1, bp, "Request canceled.");
-			g_io_deliver(bp, ENXIO);
-		} else {
-			break;
-		}
+	while ((bp = bioq_first(&sc->sc_inqueue)) != NULL) {
+		bioq_remove(&sc->sc_inqueue, bp);
+		sc->sc_queue_count--;
+		G_GATE_LOGREQ(1, bp, "Request canceled.");
+		g_io_deliver(bp, ENXIO);
 	}
-	for (;;) {
-		bp = bioq_first(&sc->sc_outqueue);
-		if (bp != NULL) {
-			bioq_remove(&sc->sc_outqueue, bp);
-			sc->sc_queue_count--;
-			G_GATE_LOGREQ(1, bp, "Request canceled.");
-			g_io_deliver(bp, ENXIO);
-		} else {
-			break;
-		}
+	while ((bp = bioq_first(&sc->sc_outqueue)) != NULL) {
+		bioq_remove(&sc->sc_outqueue, bp);
+		sc->sc_queue_count--;
+		G_GATE_LOGREQ(1, bp, "Request canceled.");
+		g_io_deliver(bp, ENXIO);
 	}
 	mtx_unlock(&sc->sc_queue_mtx);
 	g_topology_unlock();