From owner-p4-projects@FreeBSD.ORG  Tue Dec 19 04:29:58 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4B4A416A416; Tue, 19 Dec 2006 04:29:58 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 20C7216A407
	for <perforce@freebsd.org>; Tue, 19 Dec 2006 04:29:58 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DFDD043C9F
	for <perforce@freebsd.org>; Tue, 19 Dec 2006 04:29:57 +0000 (GMT)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBJ4ToQC012289
	for <perforce@freebsd.org>; Tue, 19 Dec 2006 04:29:50 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBJ4ToCo012286
	for perforce@freebsd.org; Tue, 19 Dec 2006 04:29:50 GMT
	(envelope-from mjacob@freebsd.org)
Date: Tue, 19 Dec 2006 04:29:50 GMT
Message-Id: <200612190429.kBJ4ToCo012286@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 111922 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Dec 2006 04:29:58 -0000

http://perforce.freebsd.org/chv.cgi?CH=111922

Change 111922 by mjacob@mjexp_6 on 2006/12/19 04:29:03

	Fix !($*(@$*@($* intmax goop (or lack thereof in RELENG_6).

Affected files ...

.. //depot/projects/mjexp_6/sys/geom/multipath/g_multipath.c#2 edit

Differences ...

==== //depot/projects/mjexp_6/sys/geom/multipath/g_multipath.c#2 (text+ko) ====

@@ -560,9 +560,15 @@
 		return;
 	}
     	if (pp0->mediasize != pp1->mediasize) {
-		gctl_error(req, "Provider %s has mediasize %zu; Provider %s "
-		    "has mediasize %zu", pp0->name, (intmax_t) pp0->mediasize,
+#if	__FreeBSD_version < 700000
+		gctl_error(req, "Provider %s is %llu; Provider %s is %llu",
+		    pp0->name, (unsigned long long) pp0->mediasize,
+		    pp1->name, (unsigned long long) pp1->mediasize);
+#else
+		gctl_error(req, "Provider %s is %zu; Provider %s is %zu",
+		    pp0->name, (intmax_t) pp0->mediasize,
 		    pp1->name, (intmax_t) pp1->mediasize);
+#endif
 		return;
 	}
     	if (pp0->sectorsize != pp1->sectorsize) {