From owner-svn-src-stable-9@FreeBSD.ORG Mon Nov 19 16:52:59 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F3F06286; Mon, 19 Nov 2012 16:52:58 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D81548FC12; Mon, 19 Nov 2012 16:52:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAJGqwNL002873; Mon, 19 Nov 2012 16:52:58 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAJGqwN6002872; Mon, 19 Nov 2012 16:52:58 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201211191652.qAJGqwN6002872@svn.freebsd.org> From: Ed Maste Date: Mon, 19 Nov 2012 16:52:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r243288 - stable/9/sys/geom/part X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Nov 2012 16:52:59 -0000 Author: emaste Date: Mon Nov 19 16:52:58 2012 New Revision: 243288 URL: http://svnweb.freebsd.org/changeset/base/243288 Log: MFC r232680: Remove unactionable message about label geometry It's not clear to a user what they should do after seeing the "geometry does not match label" kernel message, and it does not appear to present a problem in practice. Thus, just remove the messages. Modified: stable/9/sys/geom/part/g_part_bsd.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/geom/part/g_part_bsd.c ============================================================================== --- stable/9/sys/geom/part/g_part_bsd.c Mon Nov 19 16:39:09 2012 (r243287) +++ stable/9/sys/geom/part/g_part_bsd.c Mon Nov 19 16:52:58 2012 (r243288) @@ -394,10 +394,6 @@ g_part_bsd_read(struct g_part_table *bas goto invalid_label; if (heads != basetable->gpt_heads && !basetable->gpt_fixgeom) basetable->gpt_heads = heads; - if (sectors != basetable->gpt_sectors || heads != basetable->gpt_heads) - printf("GEOM: %s: geometry does not match label" - " (%uh,%us != %uh,%us).\n", pp->name, heads, sectors, - basetable->gpt_heads, basetable->gpt_sectors); chs = le32dec(buf + 60); if (chs < 1) @@ -407,9 +403,6 @@ g_part_bsd_read(struct g_part_table *bas chs = msize; le32enc(buf + 60, msize); } - if (chs != msize) - printf("GEOM: %s: media size does not match label.\n", - pp->name); basetable->gpt_first = 0; basetable->gpt_last = msize - 1;