From 7ae3542fd7fd182bca11bfcf4c9a2622e42da203 Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Tue, 2 Jun 2009 12:35:07 +0000 Subject: blkno's are 64 bit so need %llu, found by Parfait ok oga --- sys/ufs/ext2fs/ext2fs_subr.c | 4 ++-- sys/ufs/ffs/ffs_subr.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sys') diff --git a/sys/ufs/ext2fs/ext2fs_subr.c b/sys/ufs/ext2fs/ext2fs_subr.c index a8ac75a91ec..9046639a884 100644 --- a/sys/ufs/ext2fs/ext2fs_subr.c +++ b/sys/ufs/ext2fs/ext2fs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_subr.c,v 1.18 2008/01/05 19:49:26 otto Exp $ */ +/* $OpenBSD: ext2fs_subr.c,v 1.19 2009/06/02 12:35:05 deraadt Exp $ */ /* $NetBSD: ext2fs_subr.c,v 1.1 1997/06/11 09:34:03 bouyer Exp $ */ /* @@ -124,7 +124,7 @@ ext2fs_checkoverlap(struct buf *bp, struct inode *ip) ep->b_blkno + btodb(ep->b_bcount) <= start) continue; vprint("Disk overlap", vp); - printf("\tstart %d, end %d overlap start %d, end %ld\n", + printf("\tstart %d, end %d overlap start %llu, end %llu\n", start, last, ep->b_blkno, ep->b_blkno + btodb(ep->b_bcount) - 1); panic("Disk buffer overlap"); diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 21524c2bcbf..acbf2649a46 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_subr.c,v 1.21 2008/01/05 19:49:26 otto Exp $ */ +/* $OpenBSD: ffs_subr.c,v 1.22 2009/06/02 12:35:06 deraadt Exp $ */ /* $NetBSD: ffs_subr.c,v 1.6 1996/03/17 02:16:23 christos Exp $ */ /* @@ -142,7 +142,7 @@ ffs_checkoverlap(struct buf *bp, struct inode *ip) ep->b_blkno + btodb(ep->b_bcount) <= start) continue; vprint("Disk overlap", vp); - (void)printf("\tstart %d, end %d overlap start %d, end %ld\n", + (void)printf("\tstart %d, end %d overlap start %llu, end %llu\n", start, last, ep->b_blkno, ep->b_blkno + btodb(ep->b_bcount) - 1); panic("Disk buffer overlap"); -- cgit v1.2.3