From owner-svn-src-all@FreeBSD.ORG  Mon May 16 12:00:32 2011
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 65A41106571D;
	Mon, 16 May 2011 12:00:32 +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 54B218FC13;
	Mon, 16 May 2011 12:00:32 +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 p4GC0WDo081281;
	Mon, 16 May 2011 12:00:32 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4GC0WWf081279;
	Mon, 16 May 2011 12:00:32 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201105161200.p4GC0WWf081279@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Mon, 16 May 2011 12:00:32 +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: r221984 - 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: Mon, 16 May 2011 12:00:32 -0000

Author: ae
Date: Mon May 16 12:00:32 2011
New Revision: 221984
URL: http://svn.freebsd.org/changeset/base/221984

Log:
  Add diagnostic messages for integrity checks.

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

Modified: head/sys/geom/part/g_part.c
==============================================================================
--- head/sys/geom/part/g_part.c	Mon May 16 07:03:06 2011	(r221983)
+++ head/sys/geom/part/g_part.c	Mon May 16 12:00:32 2011	(r221984)
@@ -245,6 +245,7 @@ g_part_check_integrity(struct g_part_tab
 	struct g_part_entry *e1, *e2;
 	struct g_provider *pp;
 
+	e1 = e2 = NULL;
 	pp = cp->provider;
 	if (table->gpt_first > table->gpt_last ||
 	    table->gpt_last > pp->mediasize / pp->sectorsize - 1)
@@ -277,6 +278,25 @@ g_part_check_integrity(struct g_part_tab
 fail:
 	printf("GEOM_PART: integrity check failed (%s, %s)\n", pp->name,
 	    table->gpt_scheme->name);
+	if (bootverbose) {
+		if (e1 == NULL)
+			printf("GEOM_PART: invalid geom configuration:\n");
+		else if (e2 == NULL)
+			printf("GEOM_PART: invalid partition entry:\n");
+		else
+			printf("GEOM_PART: overlapped partition entries:\n");
+		if (e1 != NULL)
+			printf("GEOM_PART: index: %d, start: %jd, end: %jd\n",
+			    e1->gpe_index,
+			    (intmax_t)e1->gpe_start, (intmax_t)e1->gpe_end);
+		if (e2 != NULL)
+			printf("GEOM_PART: index: %d, start: %jd, end: %jd\n",
+			    e2->gpe_index,
+			    (intmax_t)e2->gpe_start, (intmax_t)e2->gpe_end);
+		printf("GEOM_PART: first: %jd, last: %jd, sectors: %jd\n",
+		    (intmax_t)table->gpt_first, (intmax_t)table->gpt_last,
+		    (intmax_t)pp->mediasize / pp->sectorsize - 1);
+	}
 	if (check_integrity == 0) {
 		table->gpt_corrupt = 1;
 		return (0);