From owner-svn-src-all@FreeBSD.ORG Wed Aug 14 07:12:01 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 99DACF5E; Wed, 14 Aug 2013 07:12:01 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (unknown [IPv6:2001:7b8:3a7:1:2d0:b7ff:fea0:8c26]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5F85123AB; Wed, 14 Aug 2013 07:12:01 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7::64a4:45e2:b359:2420] (unknown [IPv6:2001:7b8:3a7:0:64a4:45e2:b359:2420]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id D0C2D5C43; Wed, 14 Aug 2013 09:11:51 +0200 (CEST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 6.5 \(1508\)) Subject: Re: svn commit: r254286 - head/sys/fs/ext2fs From: Dimitry Andric In-Reply-To: <201308131839.r7DIdaLD037277@svn.freebsd.org> Date: Wed, 14 Aug 2013 09:11:50 +0200 Content-Transfer-Encoding: quoted-printable Message-Id: <9B5BBD34-F953-40BF-8C10-0EF466ED3350@FreeBSD.org> References: <201308131839.r7DIdaLD037277@svn.freebsd.org> To: Pedro F. Giffuni X-Mailer: Apple Mail (2.1508) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Aug 2013 07:12:01 -0000 On Aug 13, 2013, at 20:39, Pedro F. Giffuni wrote: > Author: pfg > Date: Tue Aug 13 18:39:36 2013 > New Revision: 254286 > URL: http://svnweb.freebsd.org/changeset/base/254286 >=20 > Log: > ext2fs: update format specifiers for ext4 type. >=20 > Reported by: Sam Fourman Jr. > MFC after: 3 weeks >=20 > Modified: > head/sys/fs/ext2fs/ext2_subr.c >=20 > Modified: head/sys/fs/ext2fs/ext2_subr.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/sys/fs/ext2fs/ext2_subr.c Tue Aug 13 18:14:53 2013 = (r254285) > +++ head/sys/fs/ext2fs/ext2_subr.c Tue Aug 13 18:39:36 2013 = (r254286) > @@ -150,7 +150,7 @@ ext2_checkoverlap(struct buf *bp, struct > ep->b_blkno + btodb(ep->b_bcount) <=3D start) > continue; > vprint("Disk overlap", vp); > - (void)printf("\tstart %d, end %d overlap start %lld, end = %ld\n", > + (void)printf("\tstart %ld, end %ld overlap start %lld, = end %ld\n", > start, last, (long long)ep->b_blkno, > (long)(ep->b_blkno + btodb(ep->b_bcount) - 1)); > panic("Disk buffer overlap"); This still fails on arches where int64_t is aliased to long long (basically, the 32-bit arches). Since using PRId64 is apparently frowned upon, the easiest solution is to cast the 'start' and 'last' variables to long long, and print them using %lld. -Dimitry