From owner-svn-src-all@FreeBSD.ORG Thu Oct 20 09:15:41 2011 Return-Path: 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 112F6106566B; Thu, 20 Oct 2011 09:15:41 +0000 (UTC) (envelope-from pawel@dawidek.net) Received: from mail.dawidek.net (60.wheelsystems.com [83.12.187.60]) by mx1.freebsd.org (Postfix) with ESMTP id A790A8FC0A; Thu, 20 Oct 2011 09:15:40 +0000 (UTC) Received: from localhost (58.wheelsystems.com [83.12.187.58]) by mail.dawidek.net (Postfix) with ESMTPSA id 12223999; Thu, 20 Oct 2011 11:15:39 +0200 (CEST) Date: Thu, 20 Oct 2011 11:14:58 +0200 From: Pawel Jakub Dawidek To: Andriy Gapon Message-ID: <20111020091457.GE1722@garage.freebsd.pl> References: <201110192348.p9JNmFvR047883@svn.freebsd.org> <4E9FC87B.7010903@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="hwvH6HDNit2nSK4j" Content-Disposition: inline In-Reply-To: <4E9FC87B.7010903@FreeBSD.org> X-OS: FreeBSD 9.0-CURRENT amd64 User-Agent: Mutt/1.5.21 (2010-09-15) 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Oct 2011 09:15:41 -0000 --hwvH6HDNit2nSK4j Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Oct 20, 2011 at 10:06:35AM +0300, Andriy Gapon wrote: > 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 > >=20 > > Log: > > Fix missing return when LOADER_GPT_SUPPORT is defined, but LOADER_MBR= _SUPPORT > > is not. > > =20 > > MFC after: 3 days > >=20 > > Modified: > > head/sys/boot/common/disk.c > >=20 > > Modified: head/sys/boot/common/disk.c > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- 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) > > =20 > > #ifdef LOADER_GPT_SUPPORT > > rc =3D disk_opengpt(dev); > > - if (rc) > > #endif > > #ifdef LOADER_MBR_SUPPORT > > + if (rc) > > rc =3D disk_openmbr(dev); > > #endif > > =20 >=20 > I believe that this fix is incorrect. Now with !LOADER_GPT_SUPPORT and > LOADER_MBR_SUPPORT the preprocessed code would be: >=20 > rc =3D 0; > /* > * While we are reading disk metadata, make sure we do it relative > * to the start of the disk > */ > dev->d_offset =3D 0; >=20 > if (rc) > rc =3D disk_openmbr(dev); > > Please see my take at the problem: > https://gitorious.org/~avg/freebsd/avgbsd/commit/49adde51339791a7bf0e2c75= f24eeda2bc886da5 Yes, you are right. Feel free to commit your fix. --=20 Pawel Jakub Dawidek http://www.wheelsystems.com FreeBSD committer http://www.FreeBSD.org Am I Evil? Yes, I Am! http://yomoli.com --hwvH6HDNit2nSK4j Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAk6f5pAACgkQForvXbEpPzQolACeL2ck8y6UKqE255af6xK8xCkH 5o8AoNZU9BdzCpIf0W2pAGhu26U+FaOQ =4xpt -----END PGP SIGNATURE----- --hwvH6HDNit2nSK4j--