From owner-svn-src-head@FreeBSD.ORG  Tue Apr 16 17:47:13 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id D24E93D7;
 Tue, 16 Apr 2013 17:47:13 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C5210B3A;
 Tue, 16 Apr 2013 17:47:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3GHlDYN043149;
 Tue, 16 Apr 2013 17:47:13 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3GHlDI7043148;
 Tue, 16 Apr 2013 17:47:13 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201304161747.r3GHlDI7043148@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 16 Apr 2013 17:47:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249556 - head/sys/geom
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Tue, 16 Apr 2013 17:47:13 -0000

Author: brooks
Date: Tue Apr 16 17:47:13 2013
New Revision: 249556
URL: http://svnweb.freebsd.org/changeset/base/249556

Log:
  Partial MFP4 of 222836:
  
  Only look for FDT partitions if our potential parent is a DISK device.
  
  Excluding direct recursion on the flashmap geoms was insufficient
  because it did not prevent the underlying device from being retrieved if
  flashmap geoms were further partitioned.
  
  Reviewed by:	imp
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/geom/geom_flashmap.c

Modified: head/sys/geom/geom_flashmap.c
==============================================================================
--- head/sys/geom/geom_flashmap.c	Tue Apr 16 17:30:13 2013	(r249555)
+++ head/sys/geom/geom_flashmap.c	Tue Apr 16 17:47:13 2013	(r249556)
@@ -174,7 +174,7 @@ g_flashmap_taste(struct g_class *mp, str
 	g_topology_assert();
 
 	if (flags == G_TF_NORMAL &&
-	    !strcmp(pp->geom->class->name, FLASHMAP_CLASS_NAME))
+	    strcmp(pp->geom->class->name, G_DISK_CLASS_NAME) != 0)
 		return (NULL);
 
 	gp = g_slice_new(mp, FLASH_SLICES_MAX_NUM, pp, &cp, NULL, 0,