diff options
| author |   jasper <jasper@openbsd.org> | 2009-08-21 11:38:18 +0000 |
|---|---|---|
| committer | jasper <jasper@openbsd.org> | 2009-08-21 11:38:18 +0000 |
| commit | b61c439e1470eae3356a8426cbb6083b99a97c9f (patch) | |
| tree | 0634b9375e41af3ce11012ae66ba2a8ab20def64 | |
| parent | Move reading termios settings to before tty_open alters them, and expand the (diff) | |
| download | wireguard-openbsd-b61c439e1470eae3356a8426cbb6083b99a97c9f.tar.xz wireguard-openbsd-b61c439e1470eae3356a8426cbb6083b99a97c9f.zip | |
- 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@
| -rw-r--r-- | sys/ufs/ext2fs/ext2fs_subr.c | 6 |
1 files 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"); |