From owner-svn-src-stable@FreeBSD.ORG Thu Jan 26 09:56:30 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2C482106566C; Thu, 26 Jan 2012 09:56:30 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 169C48FC13; Thu, 26 Jan 2012 09:56:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0Q9uTa9075427; Thu, 26 Jan 2012 09:56:29 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0Q9uT7c075425; Thu, 26 Jan 2012 09:56:29 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201201260956.q0Q9uT7c075425@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Thu, 26 Jan 2012 09:56:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r230573 - stable/8/sys/geom/part X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jan 2012 09:56:30 -0000 Author: ae Date: Thu Jan 26 09:56:29 2012 New Revision: 230573 URL: http://svn.freebsd.org/changeset/base/230573 Log: MFC r222281: Do not truncate available disk space to the closest track boundary. Modified: stable/8/sys/geom/part/g_part_pc98.c Directory Properties: stable/8/sys/ (props changed) Modified: stable/8/sys/geom/part/g_part_pc98.c ============================================================================== --- stable/8/sys/geom/part/g_part_pc98.c Thu Jan 26 09:55:16 2012 (r230572) +++ stable/8/sys/geom/part/g_part_pc98.c Thu Jan 26 09:56:29 2012 (r230573) @@ -220,7 +220,6 @@ g_part_pc98_create(struct g_part_table * { struct g_provider *pp; struct g_part_pc98_table *table; - uint32_t cyl, msize; pp = gpp->gpp_provider; if (pp->sectorsize < SECSIZE || pp->mediasize < 2 * SECSIZE) @@ -228,11 +227,8 @@ g_part_pc98_create(struct g_part_table * if (pp->sectorsize > SECSIZE) return (ENXIO); - cyl = basetable->gpt_heads * basetable->gpt_sectors; - - msize = MIN(pp->mediasize / SECSIZE, UINT32_MAX); - basetable->gpt_first = cyl; - basetable->gpt_last = msize - (msize % cyl) - 1; + basetable->gpt_first = basetable->gpt_heads * basetable->gpt_sectors; + basetable->gpt_last = MIN(pp->mediasize / SECSIZE, UINT32_MAX) - 1; table = (struct g_part_pc98_table *)basetable; le16enc(table->boot + DOSMAGICOFFSET, DOSMAGIC); @@ -453,7 +449,7 @@ g_part_pc98_read(struct g_part_table *ba basetable->gpt_entries = NDOSPART; basetable->gpt_first = cyl; - basetable->gpt_last = msize - (msize % cyl) - 1; + basetable->gpt_last = msize - 1; g_free(buf); return (0);