From owner-svn-src-head@FreeBSD.ORG  Mon Mar 30 00:48:43 2009
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4555B1065672;
	Mon, 30 Mar 2009 00:48:43 +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 33A988FC0A;
	Mon, 30 Mar 2009 00:48:43 +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 n2U0mgdh049118;
	Mon, 30 Mar 2009 00:48:42 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2U0mgDl049117;
	Mon, 30 Mar 2009 00:48:42 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <200903300048.n2U0mgDl049117@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Mon, 30 Mar 2009 00:48:42 +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: r190535 - head/sys/geom/part
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 30 Mar 2009 00:48:43 -0000

Author: marcel
Date: Mon Mar 30 00:48:42 2009
New Revision: 190535
URL: http://svn.freebsd.org/changeset/base/190535

Log:
  Sharpen the saw:
  o  EBR uses 32-bit block numbers. Limit the scheme to 2^32-1
     blocks when the media is larger.
  o  Calculate the number of entries based on the rounded media
     size, rather than the raw media size.

Modified:
  head/sys/geom/part/g_part_ebr.c

Modified: head/sys/geom/part/g_part_ebr.c
==============================================================================
--- head/sys/geom/part/g_part_ebr.c	Mon Mar 30 00:33:43 2009	(r190534)
+++ head/sys/geom/part/g_part_ebr.c	Mon Mar 30 00:48:42 2009	(r190535)
@@ -237,7 +237,7 @@ g_part_ebr_create(struct g_part_table *b
 	char psn[8];
 	struct g_consumer *cp;
 	struct g_provider *pp;
-	uint64_t msize;
+	uint32_t msize;
 	int error;
 
 	pp = gpp->gpp_provider;
@@ -257,10 +257,11 @@ g_part_ebr_create(struct g_part_table *b
 	if (strcmp(psn, "MBR"))
 		return (ENXIO);
 
-	msize = pp->mediasize / pp->sectorsize;
-	basetable->gpt_entries = msize / basetable->gpt_sectors;
+	msize = MIN(pp->mediasize / pp->sectorsize, 0xffffffff);
+	msize -= msize % basetable->gpt_sectors;
 	basetable->gpt_first = 0;
-	basetable->gpt_last = msize - (msize % basetable->gpt_sectors) - 1;
+	basetable->gpt_last = msize - 1;
+	basetable->gpt_entries = msize / basetable->gpt_sectors;
 	return (0);
 }