From owner-svn-src-head@FreeBSD.ORG  Fri Feb 20 04:10:31 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E6A401065675;
	Fri, 20 Feb 2009 04:10:31 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D5C798FC08;
	Fri, 20 Feb 2009 04:10:31 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1K4AVfQ016237;
	Fri, 20 Feb 2009 04:10:31 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1K4AVZg016236;
	Fri, 20 Feb 2009 04:10:31 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <200902200410.n1K4AVZg016236@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Fri, 20 Feb 2009 04:10:31 +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: r188838 - head/sys/geom/part
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Feb 2009 04:10:32 -0000

Author: marcel
Date: Fri Feb 20 04:10:31 2009
New Revision: 188838
URL: http://svn.freebsd.org/changeset/base/188838

Log:
  Fix an infinite loop created when the last logical partition is
  removed.

Modified:
  head/sys/geom/part/g_part_ebr.c

Modified: head/sys/geom/part/g_part_ebr.c
==============================================================================
--- head/sys/geom/part/g_part_ebr.c	Fri Feb 20 02:48:58 2009	(r188837)
+++ head/sys/geom/part/g_part_ebr.c	Fri Feb 20 04:10:31 2009	(r188838)
@@ -561,9 +561,9 @@ g_part_ebr_write(struct g_part_table *ba
 		le32enc(p + 8, entry->ent.dp_start);
 		le32enc(p + 12, entry->ent.dp_size);
  
-		do {
-			next = LIST_NEXT(baseentry, gpe_entry);
-		} while (next != NULL && next->gpe_deleted);
+		next = LIST_NEXT(baseentry, gpe_entry);
+		while (next != NULL && next->gpe_deleted)
+			next = LIST_NEXT(next, gpe_entry);
 
 		p += DOSPARTSIZE;
 		if (next != NULL)