summaryrefslogtreecommitdiff
path: root/sbin/fsck_ffs/dir.c
diff options
context:
space:
mode:
authorOtto Moerbeek <otto@cvs.openbsd.org>2007-06-25 19:59:56 +0000
committerOtto Moerbeek <otto@cvs.openbsd.org>2007-06-25 19:59:56 +0000
commit4b0d7fdaf11cb688a43c7321cbcfe263c9d7d011 (patch)
tree95ad9abbff7cce4341c289d7a508cf037a0b3a77 /sbin/fsck_ffs/dir.c
parent63beb6614aaf6997d30c6ef6819a1f95f288bac0 (diff)
Teach fsck_ffs about 64-bit block addresses. ok (and help) moritz@ pedro@
Diffstat (limited to 'sbin/fsck_ffs/dir.c')
-rw-r--r--sbin/fsck_ffs/dir.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c
index 9a408abd944..173528ecccc 100644
--- a/sbin/fsck_ffs/dir.c
+++ b/sbin/fsck_ffs/dir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dir.c,v 1.20 2007/04/10 16:08:17 millert Exp $ */
+/* $OpenBSD: dir.c,v 1.21 2007/06/25 19:59:55 otto Exp $ */
/* $NetBSD: dir.c,v 1.20 1996/09/27 22:45:11 christos Exp $ */
/*
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)dir.c 8.5 (Berkeley) 12/8/94";
#else
-static const char rcsid[] = "$OpenBSD: dir.c,v 1.20 2007/04/10 16:08:17 millert Exp $";
+static const char rcsid[] = "$OpenBSD: dir.c,v 1.21 2007/06/25 19:59:55 otto Exp $";
#endif
#endif /* not lint */
@@ -67,7 +67,7 @@ struct odirtemplate odirhead = {
static int expanddir(union dinode *, char *);
static void freedir(ino_t, ino_t);
static struct direct *fsck_readdir(struct inodesc *);
-static struct bufarea *getdirblk(daddr_t, long);
+static struct bufarea *getdirblk(daddr64_t, long);
static int lftempname(char *, ino_t);
static int mkentry(struct inodesc *);
static int chgino(struct inodesc *);
@@ -553,7 +553,7 @@ makeentry(ino_t parent, ino_t ino, char *name)
static int
expanddir(union dinode *dp, char *name)
{
- daddr_t lastbn, newblk;
+ daddr64_t lastbn, newblk;
struct bufarea *bp;
char *cp, firstblk[DIRBLKSIZ];
u_int64_t dis;
@@ -718,7 +718,7 @@ lftempname(char *bufp, ino_t ino)
* Insure that it is held until another is requested.
*/
static struct bufarea *
-getdirblk(daddr_t blkno, long size)
+getdirblk(daddr64_t blkno, long size)
{
if (pdirbp != 0)