diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-07-04 20:43:45 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-07-04 20:43:45 +0000 |
commit | 943cdf79ebccf0beab1a14c6acfd119f5f1610a4 (patch) | |
tree | 307dc87b17caeb8df2e48b92dc46c0d20336a95e /sbin/fsck_ffs/pass5.c | |
parent | 937542d8433043c4fcef846cfa233bb4feaab198 (diff) |
workaround for [daddr64_t] issue; worked on mostly by otto, wee bit by me
Diffstat (limited to 'sbin/fsck_ffs/pass5.c')
-rw-r--r-- | sbin/fsck_ffs/pass5.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c index 9fffe04531b..eab452b706e 100644 --- a/sbin/fsck_ffs/pass5.c +++ b/sbin/fsck_ffs/pass5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pass5.c,v 1.34 2007/06/25 19:59:55 otto Exp $ */ +/* $OpenBSD: pass5.c,v 1.35 2007/07/04 20:43:44 deraadt Exp $ */ /* $NetBSD: pass5.c,v 1.16 1996/09/27 22:45:18 christos Exp $ */ /* @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)pass5.c 8.6 (Berkeley) 11/30/94"; #else -static const char rcsid[] = "$OpenBSD: pass5.c,v 1.34 2007/06/25 19:59:55 otto Exp $"; +static const char rcsid[] = "$OpenBSD: pass5.c,v 1.35 2007/07/04 20:43:44 deraadt Exp $"; #endif #endif /* not lint */ @@ -273,7 +273,8 @@ pass5(void) d += fs->fs_frag, i += fs->fs_frag) { frags = 0; for (j = 0; j < fs->fs_frag; j++) { - if (testbmap(d + j)) + /* XXX macppc has problems with [daddr64_t] */ + if (testbmap((u_int)d + j)) continue; setbit(cg_blksfree(newcg), i + j); frags++; |