svn commit: r190536 - head/sys/geom/part

[Marcel Moolenaar]

Author: marcel
Date: Mon Mar 30 00:53:46 2009
New Revision: 190536
URL: http://svn.freebsd.org/changeset/base/190536

Log:
  Sharpen the saw:
  o  MBR uses 32-bit block numbers. Limit the scheme to 2^32-1
     blocks when the media is larger.

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

Modified: head/sys/geom/part/g_part_mbr.c
==============================================================================
--- head/sys/geom/part/g_part_mbr.c	Mon Mar 30 00:48:42 2009	(r190535)
+++ head/sys/geom/part/g_part_mbr.c	Mon Mar 30 00:53:46 2009	(r190536)
@@ -230,7 +230,7 @@ g_part_mbr_create(struct g_part_table *b
 	struct g_consumer *cp;
 	struct g_provider *pp;
 	struct g_part_mbr_table *table;
-	uint64_t msize;
+	uint32_t msize;
 
 	pp = gpp->gpp_provider;
 	cp = LIST_FIRST(&pp->consumers);
@@ -238,7 +238,7 @@ g_part_mbr_create(struct g_part_table *b
 	if (pp->sectorsize < MBRSIZE)
 		return (ENOSPC);
 
-	msize = pp->mediasize / pp->sectorsize;
+	msize = MIN(pp->mediasize / pp->sectorsize, 0xffffffff);
 	basetable->gpt_first = basetable->gpt_sectors;
 	basetable->gpt_last = msize - (msize % basetable->gpt_sectors) - 1;