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

[Marcel Moolenaar]

Author: marcel
Date: Mon Mar 30 01:03:58 2009
New Revision: 190537
URL: http://svn.freebsd.org/changeset/base/190537

Log:
  Sharpen the saw:
  o  PC98 uses 32-bit block numbers. Limit the scheme to 2^32-1
     blocks when the media is larger. The 32-bit block numbers
     are implicit (16-bit cylinder * 8-bit head * 8-bit sector).

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

Modified: head/sys/geom/part/g_part_pc98.c
==============================================================================
--- head/sys/geom/part/g_part_pc98.c	Mon Mar 30 00:53:46 2009	(r190536)
+++ head/sys/geom/part/g_part_pc98.c	Mon Mar 30 01:03:58 2009	(r190537)
@@ -218,8 +218,7 @@ g_part_pc98_create(struct g_part_table *
 	struct g_consumer *cp;
 	struct g_provider *pp;
 	struct g_part_pc98_table *table;
-	uint64_t msize;
-	uint32_t cyl;
+	uint32_t cyl, msize;
 
 	pp = gpp->gpp_provider;
 	cp = LIST_FIRST(&pp->consumers);
@@ -231,7 +230,7 @@ g_part_pc98_create(struct g_part_table *
 
 	cyl = basetable->gpt_heads * basetable->gpt_sectors;
 
-	msize = pp->mediasize / SECSIZE;
+	msize = MIN(pp->mediasize / SECSIZE, 0xffffffff);
 	basetable->gpt_first = cyl;
 	basetable->gpt_last = msize - (msize % cyl) - 1;