From owner-svn-src-all@FreeBSD.ORG  Thu Oct 20 07:06:39 2011
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 7AEE51065673;
	Thu, 20 Oct 2011 07:06:39 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140])
	by mx1.freebsd.org (Postfix) with ESMTP id 2BAF38FC0A;
	Thu, 20 Oct 2011 07:06:37 +0000 (UTC)
Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua
	[212.40.38.100])
	by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id KAA12619;
	Thu, 20 Oct 2011 10:06:36 +0300 (EEST)
	(envelope-from avg@FreeBSD.org)
Received: from localhost ([127.0.0.1])
	by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD))
	id 1RGmi4-000JFw-Du; Thu, 20 Oct 2011 10:06:36 +0300
Message-ID: <4E9FC87B.7010903@FreeBSD.org>
Date: Thu, 20 Oct 2011 10:06:35 +0300
From: Andriy Gapon <avg@FreeBSD.org>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
	rv:7.0.1) Gecko/20111002 Thunderbird/7.0.1
MIME-Version: 1.0
To: Pawel Jakub Dawidek <pjd@FreeBSD.org>
References: <201110192348.p9JNmFvR047883@svn.freebsd.org>
In-Reply-To: <201110192348.p9JNmFvR047883@svn.freebsd.org>
X-Enigmail-Version: undefined
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
	src-committers@FreeBSD.org
Subject: Re: svn commit: r226554 - head/sys/boot/common
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, 20 Oct 2011 07:06:39 -0000

on 20/10/2011 02:48 Pawel Jakub Dawidek said the following:
> Author: pjd
> Date: Wed Oct 19 23:48:15 2011
> New Revision: 226554
> URL: http://svn.freebsd.org/changeset/base/226554
> 
> Log:
>   Fix missing return when LOADER_GPT_SUPPORT is defined, but LOADER_MBR_SUPPORT
>   is not.
>   
>   MFC after:	3 days
> 
> Modified:
>   head/sys/boot/common/disk.c
> 
> Modified: head/sys/boot/common/disk.c
> ==============================================================================
> --- head/sys/boot/common/disk.c	Wed Oct 19 23:44:38 2011	(r226553)
> +++ head/sys/boot/common/disk.c	Wed Oct 19 23:48:15 2011	(r226554)
> @@ -776,9 +776,9 @@ disk_open(struct disk_devdesc *dev)
>  
>  #ifdef LOADER_GPT_SUPPORT
>  	rc = disk_opengpt(dev);
> -	if (rc)
>  #endif
>  #ifdef LOADER_MBR_SUPPORT
> +	if (rc)
>  		rc = disk_openmbr(dev);
>  #endif
>  

I believe that this fix is incorrect.  Now with !LOADER_GPT_SUPPORT and
LOADER_MBR_SUPPORT the preprocessed code would be:

	rc = 0;
	/*
	 * While we are reading disk metadata, make sure we do it relative
	 * to the start of the disk
	 */
	dev->d_offset = 0;

	if (rc)
		rc = disk_openmbr(dev);

Please see my take at the problem:
https://gitorious.org/~avg/freebsd/avgbsd/commit/49adde51339791a7bf0e2c75f24eeda2bc886da5

-- 
Andriy Gapon