From owner-svn-src-head@FreeBSD.ORG Sat Nov 12 20:16:25 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2C7D91065680; Sat, 12 Nov 2011 20:16:25 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-gx0-f182.google.com (mail-gx0-f182.google.com [209.85.161.182]) by mx1.freebsd.org (Postfix) with ESMTP id A7D318FC08; Sat, 12 Nov 2011 20:16:24 +0000 (UTC) Received: by ggnk3 with SMTP id k3so7347335ggn.13 for ; Sat, 12 Nov 2011 12:16:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=W8gRU0HlqWfrAEChJG9ky2Ie3Eig45ALY4rtr2+DhG8=; b=df0uXilQWeRk7ctQszgq5JFYndEDBIf2vr80dezLDPqxdN+XIvtKgOCCE8wNB4twY7 38hPDUOVpSDTKhZ8WzhaKHI+4eiEbrlDsRDH7G0M18UNzylidOK8RaKJg28nMmyGULtl rdQrmPbLdejh+KgtuPKoYwvzh9+ncX5RvAzD8= MIME-Version: 1.0 Received: by 10.182.41.69 with SMTP id d5mr3805435obl.47.1321128983907; Sat, 12 Nov 2011 12:16:23 -0800 (PST) Received: by 10.182.7.34 with HTTP; Sat, 12 Nov 2011 12:16:23 -0800 (PST) In-Reply-To: <201111122001.pACK1UML059238@svn.freebsd.org> References: <201111122001.pACK1UML059238@svn.freebsd.org> Date: Sat, 12 Nov 2011 12:16:23 -0800 Message-ID: From: Garrett Cooper To: Alexander Motin Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r227473 - head/sbin/geom/class/multipath X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Nov 2011 20:16:25 -0000 On Sat, Nov 12, 2011 at 12:01 PM, Alexander Motin wrote: > Author: mav > Date: Sat Nov 12 20:01:30 2011 > New Revision: 227473 > URL: http://svn.freebsd.org/changeset/base/227473 > > Log: > =A0Fix build on some archs after r227464. > > Modified: > =A0head/sbin/geom/class/multipath/geom_multipath.c > > Modified: head/sbin/geom/class/multipath/geom_multipath.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sbin/geom/class/multipath/geom_multipath.c =A0 =A0 Sat Nov 12 19= :55:48 2011 =A0 =A0 =A0 =A0(r227472) > +++ head/sbin/geom/class/multipath/geom_multipath.c =A0 =A0 Sat Nov 12 20= :01:30 2011 =A0 =A0 =A0 =A0(r227473) > @@ -133,7 +133,8 @@ mp_label(struct gctl_req *req) > =A0 =A0 =A0 =A0uint8_t *sector, *rsector; > =A0 =A0 =A0 =A0char *ptr; > =A0 =A0 =A0 =A0uuid_t uuid; > - =A0 =A0 =A0 uint32_t secsize =3D 0, ssize, status; > + =A0 =A0 =A0 ssize_t secsize =3D 0, ssize; > + =A0 =A0 =A0 uint32_t status; > =A0 =A0 =A0 =A0const char *name, *name2, *mpname; > =A0 =A0 =A0 =A0int error, i, nargs, fd; > > @@ -161,8 +162,8 @@ mp_label(struct gctl_req *req) > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0disksize =3D msize; > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0} else { > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (secsize !=3D ssize) { > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 gctl_error(= req, "%s sector size %u different.", > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 nam= e, ssize); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 gctl_error(= req, "%s sector size %ju different.", > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 nam= e, (intmax_t)ssize); Shouldn't that be uintmax_t, not intmax_t ? -Garrett