summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
Diffstat (limited to 'sbin')
-rw-r--r--sbin/fsck_ffs/fsck.h4
-rw-r--r--sbin/fsck_ffs/pass1.c10
-rw-r--r--sbin/fsck_ffs/setup.c8
-rw-r--r--sbin/fsirand/fsirand.c4
-rw-r--r--sbin/ncheck_ffs/ncheck_ffs.c20
-rw-r--r--sbin/newfs/mkfs.c8
-rw-r--r--sbin/newfs/newfs.c4
7 files changed, 29 insertions, 29 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) {
diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c
index b0e0a90faa2..7207b69d485 100644
--- a/sbin/fsirand/fsirand.c
+++ b/sbin/fsirand/fsirand.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsirand.c,v 1.24 2007/03/19 13:30:55 pedro Exp $ */
+/* $OpenBSD: fsirand.c,v 1.25 2007/06/01 06:41:35 deraadt Exp $ */
/*
* Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -100,7 +100,7 @@ fsirand(char *device)
size_t ibufsize;
struct fs *sblock, *tmpsblock;
ino_t inumber;
- ufs2_daddr_t sblockloc, dblk;
+ daddr64_t sblockloc, dblk;
char sbuf[SBSIZE], sbuftmp[SBSIZE];
int devfd, n, cg, i;
char *devpath;
diff --git a/sbin/ncheck_ffs/ncheck_ffs.c b/sbin/ncheck_ffs/ncheck_ffs.c
index 50f86ceb1f3..73a6cc56e01 100644
--- a/sbin/ncheck_ffs/ncheck_ffs.c
+++ b/sbin/ncheck_ffs/ncheck_ffs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncheck_ffs.c,v 1.28 2007/05/21 18:12:00 millert Exp $ */
+/* $OpenBSD: ncheck_ffs.c,v 1.29 2007/06/01 06:41:35 deraadt Exp $ */
/*-
* Copyright (c) 1995, 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
@@ -55,7 +55,7 @@
*/
#ifndef lint
-static const char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.28 2007/05/21 18:12:00 millert Exp $";
+static const char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.29 2007/06/01 06:41:35 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -107,11 +107,11 @@ int nicache;
void addinode(ino_t inum);
void *getino(ino_t inum);
void findinodes(ino_t);
-void bread(ufs2_daddr_t, char *, int);
+void bread(daddr64_t, char *, int);
__dead void usage(void);
void scanonedir(ino_t, const char *);
-void dirindir(ino_t, ufs2_daddr_t, int, off_t, const char *);
-void searchdir(ino_t, ufs2_daddr_t, long, off_t, const char *);
+void dirindir(ino_t, daddr64_t, int, off_t, const char *);
+void searchdir(ino_t, daddr64_t, long, off_t, const char *);
int matchino(const void *, const void *);
int matchcache(const void *, const void *);
void cacheino(ino_t, void *);
@@ -264,7 +264,7 @@ int breaderrors = 0;
#define BREADEMAX 32
void
-bread(ufs2_daddr_t blkno, char *buf, int size)
+bread(daddr64_t blkno, char *buf, int size)
{
int cnt, i;
@@ -367,7 +367,7 @@ scanonedir(ino_t ino, const char *path)
* require the directory to be dumped.
*/
void
-dirindir(ino_t ino, ufs2_daddr_t blkno, int ind_level, off_t filesize,
+dirindir(ino_t ino, daddr64_t blkno, int ind_level, off_t filesize,
const char *path)
{
int i;
@@ -381,7 +381,7 @@ dirindir(ino_t ino, ufs2_daddr_t blkno, int ind_level, off_t filesize,
if (sblock->fs_magic == FS_UFS1_MAGIC)
blkno = ((ufs1_daddr_t *)idblk)[i];
else
- blkno = ((ufs2_daddr_t *)idblk)[i];
+ blkno = ((daddr64_t *)idblk)[i];
if (blkno != 0)
searchdir(ino, blkno, sblock->fs_bsize,
filesize, path);
@@ -393,7 +393,7 @@ dirindir(ino_t ino, ufs2_daddr_t blkno, int ind_level, off_t filesize,
if (sblock->fs_magic == FS_UFS1_MAGIC)
blkno = ((ufs1_daddr_t *)idblk)[i];
else
- blkno = ((ufs2_daddr_t *)idblk)[i];
+ blkno = ((daddr64_t *)idblk)[i];
if (blkno != 0)
dirindir(ino, blkno, ind_level, filesize, path);
}
@@ -405,7 +405,7 @@ dirindir(ino_t ino, ufs2_daddr_t blkno, int ind_level, off_t filesize,
* contains any subdirectories.
*/
void
-searchdir(ino_t ino, ufs2_daddr_t blkno, long size, off_t filesize,
+searchdir(ino_t ino, daddr64_t blkno, long size, off_t filesize,
const char *path)
{
char *dblk;
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index 3b2cc58df5f..b48b2164b11 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkfs.c,v 1.64 2007/05/29 06:28:16 otto Exp $ */
+/* $OpenBSD: mkfs.c,v 1.65 2007/06/01 06:41:35 deraadt Exp $ */
/* $NetBSD: mkfs.c,v 1.25 1995/06/18 21:35:38 cgd Exp $ */
/*
@@ -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(ufs2_daddr_t);
+ sblock.fs_nindir = sblock.fs_bsize / sizeof(daddr64_t);
sblock.fs_inopb = sblock.fs_bsize / sizeof(struct ufs2_dinode);
sblock.fs_maxsymlinklen = MAXSYMLINKLEN_UFS2;
}
@@ -605,7 +605,7 @@ void
initcg(int cylno, time_t utime)
{
int i, j, d, dlower, dupper, blkno, start;
- ufs2_daddr_t cbase, dmax;
+ daddr64_t cbase, dmax;
struct ufs1_dinode *dp1;
struct ufs2_dinode *dp2;
struct csum *cs;
@@ -960,7 +960,7 @@ goth:
void
iput(union dinode *ip, ino_t ino)
{
- ufs2_daddr_t d;
+ daddr64_t d;
if (Oflag <= 1)
ip->dp1.di_gen = (u_int32_t)arc4random();
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 98541cf8957..15e6b935c07 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: newfs.c,v 1.65 2007/05/29 06:28:16 otto Exp $ */
+/* $OpenBSD: newfs.c,v 1.66 2007/06/01 06:41:35 deraadt Exp $ */
/* $NetBSD: newfs.c,v 1.20 1996/05/16 07:13:03 thorpej Exp $ */
/*
@@ -99,7 +99,7 @@ u_short dkcksum(struct disklabel *);
* block worth of data blocks.
*/
#define MAXBLKPG_FFS1(bsize) ((bsize) / sizeof(ufs1_daddr_t))
-#define MAXBLKPG_FFS2(bsize) ((bsize) / sizeof(ufs2_daddr_t))
+#define MAXBLKPG_FFS2(bsize) ((bsize) / sizeof(daddr64_t))
/*
* Each file system has a number of inodes statically allocated.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 01:52:38 +0000