From owner-svn-src-all@FreeBSD.ORG  Thu Mar  8 01:48:44 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EA39D1065670;
	Thu,  8 Mar 2012 01:48:44 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DA06B8FC12;
	Thu,  8 Mar 2012 01:48:44 +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 q281migb020002;
	Thu, 8 Mar 2012 01:48:44 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q281miii020000;
	Thu, 8 Mar 2012 01:48:44 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201203080148.q281miii020000@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 8 Mar 2012 01:48:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232680 - head/sys/geom/part
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Mar 2012 01:48:45 -0000

Author: emaste
Date: Thu Mar  8 01:48:44 2012
New Revision: 232680
URL: http://svn.freebsd.org/changeset/base/232680

Log:
  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.
  
  Approved by:	marcel

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

Modified: head/sys/geom/part/g_part_bsd.c
==============================================================================
--- head/sys/geom/part/g_part_bsd.c	Thu Mar  8 01:47:12 2012	(r232679)
+++ head/sys/geom/part/g_part_bsd.c	Thu Mar  8 01:48:44 2012	(r232680)
@@ -389,10 +389,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)
@@ -402,9 +398,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;