diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-01 06:41:36 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-01 06:41:36 +0000 |
| commit | 824a970e30351d4de896876ea15ace2a180afc11 (patch) | |
| tree | 814a4b6fb65c3aaae9109db47ff1175f5b852a28 /sbin/fsck_ffs | |
| parent | b47f94170767961b0247fd52c87bd86f9f482b1c (diff) | |
convert ufs2_daddr_t -> daddr64_t for greater clarity; ok pedro otto thib
Diffstat (limited to 'sbin/fsck_ffs')
| -rw-r--r-- | sbin/fsck_ffs/fsck.h | 4 | ||||
| -rw-r--r-- | sbin/fsck_ffs/pass1.c | 10 | ||||
| -rw-r--r-- | sbin/fsck_ffs/setup.c | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index a5a1e746ed8..e759aee1493 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fsck.h,v 1.18 2007/04/10 16:08:17 millert Exp $ */ +/* $OpenBSD: fsck.h,v 1.19 2007/06/01 06:41:33 deraadt Exp $ */ /* $NetBSD: fsck.h,v 1.13 1996/10/11 20:15:46 thorpej Exp $ */ /* @@ -86,7 +86,7 @@ struct bufarea { union { char *b_buf; /* buffer space */ ufs1_daddr_t *b_indir1; /* FFS1 indirect block */ - ufs2_daddr_t *b_indir2; /* FFS2 indirect block */ + daddr64_t *b_indir2; /* FFS2 indirect block */ struct fs *b_fs; /* super block */ struct cg *b_cg; /* cylinder group */ struct ufs1_dinode *b_dinode1; /* FFS1 inode block */ diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c index da281ec08fb..78c8f5a0c60 100644 --- a/sbin/fsck_ffs/pass1.c +++ b/sbin/fsck_ffs/pass1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pass1.c,v 1.23 2007/04/10 16:08:17 millert Exp $ */ +/* $OpenBSD: pass1.c,v 1.24 2007/06/01 06:41:33 deraadt Exp $ */ /* $NetBSD: pass1.c,v 1.16 1996/09/27 22:45:15 christos Exp $ */ /* @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)pass1.c 8.1 (Berkeley) 6/5/93"; #else -static const char rcsid[] = "$OpenBSD: pass1.c,v 1.23 2007/04/10 16:08:17 millert Exp $"; +static const char rcsid[] = "$OpenBSD: pass1.c,v 1.24 2007/06/01 06:41:33 deraadt Exp $"; #endif #endif /* not lint */ @@ -138,9 +138,9 @@ checkinode(ino_t inumber, struct inodesc *idesc) dp->dp1.di_mode || dp->dp1.di_size)) || (sblock.fs_magic == FS_UFS2_MAGIC && (memcmp(dp->dp2.di_db, ufs2_zino.di_db, - NDADDR * sizeof(ufs2_daddr_t)) || + NDADDR * sizeof(daddr64_t)) || memcmp(dp->dp2.di_ib, ufs2_zino.di_ib, - NIADDR * sizeof(ufs2_daddr_t)) || + NIADDR * sizeof(daddr64_t)) || dp->dp2.di_mode || dp->dp2.di_size))) { pfatal("PARTIALLY ALLOCATED INODE I=%u", inumber); if (reply("CLEAR") == 1) { @@ -216,7 +216,7 @@ checkinode(ino_t inumber, struct inodesc *idesc) sizeof(ufs1_daddr_t)); else ndb = howmany(DIP(dp, di_size), - sizeof(ufs2_daddr_t)); + sizeof(daddr64_t)); if (ndb > NDADDR) { j = ndb - NDADDR; for (ndb = 1; j > 1; j--) diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index 3c007e05a5a..771aecfbb44 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: setup.c,v 1.35 2007/05/29 06:28:15 otto Exp $ */ +/* $OpenBSD: setup.c,v 1.36 2007/06/01 06:41:33 deraadt Exp $ */ /* $NetBSD: setup.c,v 1.27 1996/09/27 22:45:19 christos Exp $ */ /* @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)setup.c 8.5 (Berkeley) 11/23/94"; #else -static const char rcsid[] = "$OpenBSD: setup.c,v 1.35 2007/05/29 06:28:15 otto Exp $"; +static const char rcsid[] = "$OpenBSD: setup.c,v 1.36 2007/06/01 06:41:33 deraadt Exp $"; #endif #endif /* not lint */ @@ -357,7 +357,7 @@ setup(char *dev) } } if (sblock.fs_magic == FS_UFS2_MAGIC) - nindir = sblock.fs_bsize / sizeof(ufs2_daddr_t); + nindir = sblock.fs_bsize / sizeof(daddr64_t); else nindir = sblock.fs_bsize / sizeof(ufs1_daddr_t); if (NINDIR(&sblock) != nindir) { @@ -461,7 +461,7 @@ badsblabel: static int readsb(int listerr) { - ufs2_daddr_t super = 0; + daddr64_t super = 0; int i; if (bflag) { |