From owner-svn-src-head@FreeBSD.ORG Sun Nov 13 22:09:13 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 6BC0A106564A; Sun, 13 Nov 2011 22:09:13 +0000 (UTC) (envelope-from pawel@dawidek.net) Received: from mail.dawidek.net (60.wheelsystems.com [83.12.187.60]) by mx1.freebsd.org (Postfix) with ESMTP id E593E8FC0A; Sun, 13 Nov 2011 22:09:12 +0000 (UTC) Received: from localhost (58.wheelsystems.com [83.12.187.58]) by mail.dawidek.net (Postfix) with ESMTPSA id AB5C4D97; Sun, 13 Nov 2011 23:09:10 +0100 (CET) Date: Sun, 13 Nov 2011 23:08:17 +0100 From: Pawel Jakub Dawidek To: Garrett Cooper Message-ID: <20111113220817.GC1677@garage.freebsd.pl> References: <201111122001.pACK1UML059238@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="7iMSBzlTiPOCCT2k" Content-Disposition: inline In-Reply-To: X-OS: FreeBSD 9.0-CURRENT amd64 User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, Alexander Motin , src-committers@freebsd.org, svn-src-all@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: Sun, 13 Nov 2011 22:09:13 -0000 --7iMSBzlTiPOCCT2k Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Nov 12, 2011 at 12:16:23PM -0800, Garrett Cooper wrote: > 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_erro= r(req, "%s sector size %u different.", > > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 n= ame, ssize); > > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 gctl_erro= r(req, "%s sector size %ju different.", > > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 n= ame, (intmax_t)ssize); >=20 > Shouldn't that be uintmax_t, not intmax_t ? No, ssize_t is signed. Although the best would be to use %zd for ssize_t. --=20 Pawel Jakub Dawidek http://www.wheelsystems.com FreeBSD committer http://www.FreeBSD.org Am I Evil? Yes, I Am! http://yomoli.com --7iMSBzlTiPOCCT2k Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAk7AP9EACgkQForvXbEpPzQ7wwCffcAZNzJKHhNaOOqM/9MdR97D lw8AoPMt9npvACECUTj0pj+Olpw4XVb9 =pE42 -----END PGP SIGNATURE----- --7iMSBzlTiPOCCT2k--