svn commit: r243288 - stable/9/sys/geom/part

Ed Maste emaste at FreeBSD.org
Mon Nov 19 16:52:59 UTC 2012


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;


More information about the svn-src-stable-9 mailing list