diff options
| author | Pedro Martelletto <pedro@cvs.openbsd.org> | 2007-06-01 23:42:36 +0000 |
|---|---|---|
| committer | Pedro Martelletto <pedro@cvs.openbsd.org> | 2007-06-01 23:42:36 +0000 |
| commit | 1b739e73e223f9c851a42f8417dda3d6e71ed3ff (patch) | |
| tree | 4d177508418d6674c1b850cd10836a8165891af9 /sbin/newfs | |
| parent | 442f64cf0df0d38e9f4cd280a06fe8270dd85d1b (diff) | |
ufs1_daddr_t cleanup, okay otto@
Diffstat (limited to 'sbin/newfs')
| -rw-r--r-- | sbin/newfs/mkfs.c | 6 | ||||
| -rw-r--r-- | sbin/newfs/newfs.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c index 7ad651eb56b..29332c9799c 100644 --- a/sbin/newfs/mkfs.c +++ b/sbin/newfs/mkfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkfs.c,v 1.66 2007/06/01 23:08:23 otto Exp $ */ +/* $OpenBSD: mkfs.c,v 1.67 2007/06/01 23:42:35 pedro Exp $ */ /* $NetBSD: mkfs.c,v 1.25 1995/06/18 21:35:38 cgd Exp $ */ /* @@ -264,7 +264,7 @@ mkfs(struct partition *pp, char *fsys, int fi, int fo, mode_t mfsmode, */ if (Oflag <= 1) { sblock.fs_sblockloc = SBLOCK_UFS1; - sblock.fs_nindir = sblock.fs_bsize / sizeof(ufs1_daddr_t); + sblock.fs_nindir = sblock.fs_bsize / sizeof(int32_t); sblock.fs_inopb = sblock.fs_bsize / sizeof(struct ufs1_dinode); if (Oflag == 0) { sblock.fs_maxsymlinklen = 0; @@ -284,7 +284,7 @@ mkfs(struct partition *pp, char *fsys, int fi, int fo, mode_t mfsmode, } else { sblock.fs_inodefmt = FS_44INODEFMT; sblock.fs_sblockloc = SBLOCK_UFS2; - sblock.fs_nindir = sblock.fs_bsize / sizeof(daddr64_t); + sblock.fs_nindir = sblock.fs_bsize / sizeof(int64_t); sblock.fs_inopb = sblock.fs_bsize / sizeof(struct ufs2_dinode); sblock.fs_maxsymlinklen = MAXSYMLINKLEN_UFS2; } diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c index 15e6b935c07..90a0b0a6d28 100644 --- a/sbin/newfs/newfs.c +++ b/sbin/newfs/newfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: newfs.c,v 1.66 2007/06/01 06:41:35 deraadt Exp $ */ +/* $OpenBSD: newfs.c,v 1.67 2007/06/01 23:42:35 pedro Exp $ */ /* $NetBSD: newfs.c,v 1.20 1996/05/16 07:13:03 thorpej Exp $ */ /* @@ -98,8 +98,8 @@ u_short dkcksum(struct disklabel *); * placed in a single cylinder group. The default is one indirect * block worth of data blocks. */ -#define MAXBLKPG_FFS1(bsize) ((bsize) / sizeof(ufs1_daddr_t)) -#define MAXBLKPG_FFS2(bsize) ((bsize) / sizeof(daddr64_t)) +#define MAXBLKPG_FFS1(bsize) ((bsize) / sizeof(int32_t)) +#define MAXBLKPG_FFS2(bsize) ((bsize) / sizeof(int64_t)) /* * Each file system has a number of inodes statically allocated. |