Date: Sat, 12 Nov 2011 12:16:23 -0800 From: Garrett Cooper <yanegomi@gmail.com> To: Alexander Motin <mav@freebsd.org> 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 Message-ID: <CAGH67wScn5fvZ-ZFkcPDTkhxF9K2isWMQHA7wsHiy5PihidZCA@mail.gmail.com> In-Reply-To: <201111122001.pACK1UML059238@svn.freebsd.org> References: <201111122001.pACK1UML059238@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, Nov 12, 2011 at 12:01 PM, Alexander Motin <mav@freebsd.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGH67wScn5fvZ-ZFkcPDTkhxF9K2isWMQHA7wsHiy5PihidZCA>