From c3b17649e10ff255eabce5fcb45b79df5af9527e Mon Sep 17 00:00:00 2001 From: Jasper Lievisse Adriaanse Date: Fri, 21 Aug 2009 11:38:19 +0000 Subject: - change two variables to daddr64_t, eventhough they won't overflow as ext2fs doesn't support filesystems so large, it's more correct this way - fix a format string to %lld for daddr64_t ok tedu@ thib@ --- sys/ufs/ext2fs/ext2fs_subr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/ufs/ext2fs/ext2fs_subr.c b/sys/ufs/ext2fs/ext2fs_subr.c index 9046639a884..4fc593f38bd 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.19 2009/06/02 12:35:05 deraadt Exp $ */ +/* $OpenBSD: ext2fs_subr.c,v 1.20 2009/08/21 11:38:18 jasper Exp $ */ /* $NetBSD: ext2fs_subr.c,v 1.1 1997/06/11 09:34:03 bouyer Exp $ */ /* @@ -106,8 +106,8 @@ void ext2fs_checkoverlap(struct buf *bp, struct inode *ip) { struct buf *ep; - int32_t start, last; struct vnode *vp; + daddr64_t start, last; start = bp->b_blkno; last = start + btodb(bp->b_bcount) - 1; @@ -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 %llu, end %llu\n", + printf("\tstart %lld, end %lld overlap start %lld, end %lld\n", start, last, ep->b_blkno, ep->b_blkno + btodb(ep->b_bcount) - 1); panic("Disk buffer overlap"); -- cgit v1.2.3