Date: Mon, 30 Mar 2009 00:48:42 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r190535 - head/sys/geom/part Message-ID: <200903300048.n2U0mgDl049117@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903300048.n2U0mgDl049117>