From owner-svn-src-all@FreeBSD.ORG  Wed Jun 24 06:42:14 2009
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 13F73106566C;
	Wed, 24 Jun 2009 06:42:14 +0000 (UTC)
	(envelope-from jhay@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 030188FC16;
	Wed, 24 Jun 2009 06:42:14 +0000 (UTC)
	(envelope-from jhay@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 n5O6gDV4004319;
	Wed, 24 Jun 2009 06:42:13 GMT (envelope-from jhay@svn.freebsd.org)
Received: (from jhay@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5O6gDiB004317;
	Wed, 24 Jun 2009 06:42:13 GMT (envelope-from jhay@svn.freebsd.org)
Message-Id: <200906240642.n5O6gDiB004317@svn.freebsd.org>
From: John Hay <jhay@FreeBSD.org>
Date: Wed, 24 Jun 2009 06:42:13 +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: r194811 - head/sys/geom
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: Wed, 24 Jun 2009 06:42:14 -0000

Author: jhay
Date: Wed Jun 24 06:42:13 2009
New Revision: 194811
URL: http://svn.freebsd.org/changeset/base/194811

Log:
  Do not stop the loop when an empty or deleted directory entry is found.
  Rather just skip over it.

Modified:
  head/sys/geom/geom_redboot.c

Modified: head/sys/geom/geom_redboot.c
==============================================================================
--- head/sys/geom/geom_redboot.c	Wed Jun 24 06:15:18 2009	(r194810)
+++ head/sys/geom/geom_redboot.c	Wed Jun 24 06:42:13 2009	(r194811)
@@ -195,7 +195,9 @@ parse_fis_directory(u_char *buf, size_t 
 	 */
 	fisdir = redbcfg = NULL;
 	*(tail = &head) = NULL;
-	for (i = 0; fd < efd && fd->name[0] != 0xff; i++, fd++) {
+	for (i = 0; fd < efd; i++, fd++) {
+		if (fd->name[0] == 0xff)
+			continue;
 		if (match(fd->name, FISDIR_NAME))
 			fisdir = fd;
 		else if (match(fd->name, REDBCFG_NAME))