From owner-p4-projects@FreeBSD.ORG Tue Dec 19 06:48:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C32316A47B; Tue, 19 Dec 2006 06:48:53 +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 406BF16A40F for ; Tue, 19 Dec 2006 06:48:53 +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 6EFAB43CBA for ; Tue, 19 Dec 2006 06:48:47 +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 kBJ6mijb045693 for ; Tue, 19 Dec 2006 06:48:44 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBJ6mhXV045690 for perforce@freebsd.org; Tue, 19 Dec 2006 06:48:43 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 19 Dec 2006 06:48:43 GMT Message-Id: <200612190648.kBJ6mhXV045690@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111925 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Dec 2006 06:48:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=111925 Change 111925 by mjacob@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) {