Module Name: src
Committed By: christos
Date: Fri Aug 21 15:33:04 UTC 2015
Modified Files:
src/sys/arch/x68k/stand/boot_ufs: readufs.h readufs_lfs.c
Log Message:
fix build (dholland)
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x68k/stand/boot_ufs/readufs.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/stand/boot_ufs/readufs.h
diff -u src/sys/arch/x68k/stand/boot_ufs/readufs.h:1.12 src/sys/arch/x68k/stand/boot_ufs/readufs.h:1.13
--- src/sys/arch/x68k/stand/boot_ufs/readufs.h:1.12 Tue Jun 18 14:18:58 2013
+++ src/sys/arch/x68k/stand/boot_ufs/readufs.h Fri Aug 21 11:33:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs.h,v 1.12 2013/06/18 18:18:58 christos Exp $ */
+/* $NetBSD: readufs.h,v 1.13 2015/08/21 15:33:04 christos Exp $ */
/* from Id: readufs.h,v 1.9 2003/10/15 14:16:58 itohy Exp */
/*
@@ -26,8 +26,7 @@ union ufs_dinode {
struct ufs2_dinode di2;
#endif
#ifdef USE_LFS
- struct ulfs1_dinode dil1;
- struct ulfs2_dinode dil2;
+ struct lfs32_dinode dil32;
#endif
};
Index: src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c
diff -u src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c:1.16 src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c:1.17
--- src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c:1.16 Tue Jul 28 12:51:25 2015
+++ src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c Fri Aug 21 11:33:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs_lfs.c,v 1.16 2015/07/28 16:51:25 christos Exp $ */
+/* $NetBSD: readufs_lfs.c,v 1.17 2015/08/21 15:33:04 christos Exp $ */
/* from Id: readufs_lfs.c,v 1.7 2003/10/15 14:16:58 itohy Exp */
/*
@@ -21,7 +21,7 @@
static int get_lfs_inode(ino32_t ino, union ufs_dinode *dibuf);
-static struct ulfs1_dinode ifile_dinode;
+static struct lfs32_dinode ifile_dinode;
#define fsi (*ufsinfo)
#define fsi_lfs fsi.fs_u.u_lfs
@@ -159,7 +159,7 @@ get_lfs_inode(ino32_t ino, union ufs_din
struct ufs_info *ufsinfo = &ufs_info;
daddr_t daddr;
char *buf = alloca(fsi.bsize);
- struct ulfs1_dinode *di, *diend;
+ struct lfs32_dinode *di, *diend;
int i;
/* Get fs block which contains the specified inode. */
@@ -176,7 +176,7 @@ get_lfs_inode(ino32_t ino, union ufs_din
i = ino % fsi_lfs.ifpb;
daddr = (fsi_lfs.version == 1) ?
((IFILE_V1 *) buf + i)->if_daddr
- : ((IFILE *) buf + i)->if_daddr;
+ : ((IFILE32 *) buf + i)->if_daddr;
}
#ifdef DEBUG_WITH_STDIO
printf("LFS(%d): daddr: %d\n", ino, (int) daddr);
@@ -195,7 +195,7 @@ get_lfs_inode(ino32_t ino, union ufs_din
);
/* Search for the inode. */
- di = (struct ulfs1_dinode *) buf;
+ di = (struct lfs32_dinode *) buf;
diend = di + fsi_lfs.inopb;
for ( ; di < diend; di++)
@@ -219,7 +219,7 @@ found:
#endif
#endif
- dibuf->dil1 = *di;
+ dibuf->dil32 = *di;
return 0;
}
