From owner-svn-src-all@FreeBSD.ORG  Thu Oct 23 15:44:00 2008
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 8FDA1106566C;
	Thu, 23 Oct 2008 15:44:00 +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 7DD2C8FC34;
	Thu, 23 Oct 2008 15:44:00 +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 m9NFi0hl060413;
	Thu, 23 Oct 2008 15:44:00 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9NFi0E1060412;
	Thu, 23 Oct 2008 15:44:00 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <200810231544.m9NFi0E1060412@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Thu, 23 Oct 2008 15:44:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184204 - in stable/7/sys: . geom/part
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, 23 Oct 2008 15:44:00 -0000

Author: marcel
Date: Thu Oct 23 15:44:00 2008
New Revision: 184204
URL: http://svn.freebsd.org/changeset/base/184204

Log:
  MFC rev 183455:
  Return G_PART_PROBE_PRI_HIGH instead of G_PART_PROBE_PRI_NORM
  if the probe succeeds. This guarantees that the BSD scheme
  wins over the MBR scheme when MBR gets to probe first.
  
  Approved by:	re (kib@)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/geom/part/g_part_bsd.c

Modified: stable/7/sys/geom/part/g_part_bsd.c
==============================================================================
--- stable/7/sys/geom/part/g_part_bsd.c	Thu Oct 23 15:32:06 2008	(r184203)
+++ stable/7/sys/geom/part/g_part_bsd.c	Thu Oct 23 15:44:00 2008	(r184204)
@@ -293,7 +293,7 @@ g_part_bsd_probe(struct g_part_table *ta
 	magic2 = le32dec(buf + 132);
 	g_free(buf);
 	return ((magic1 == DISKMAGIC && magic2 == DISKMAGIC)
-	    ? G_PART_PROBE_PRI_NORM : ENXIO);
+	    ? G_PART_PROBE_PRI_HIGH : ENXIO);
 }
 
 static int