PERFORCE change 111925 for review

[Matt Jacob]

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

Change 111925 by mjacob at mjexp on 2006/12/19 06:48:09

	Merge from mjexp_6.

Affected files ...

.. //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#7 integrate

Differences ...

==== //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#7 (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) {