x68k build broken on arch/x68k/stand/boot_ufs

[Tetsuya Isaki <isaki%NetBSD.org@localhost>]

Hi, dholland@,

x68k build has failed since the recent LFS changes.
(see also daily snapshot build log)

I don't know much about LFS, but the following patch made
the build succeed.  Please review it. (If ok, I'll commit it
or please go ahead)

arch/x68k/stand/boot_ufs has its own ufs code.  We understood
that it's problematic but have no better solution to replace it...


Index: readufs.h
===================================================================
RCS file: /cvsroot/src/sys/arch/x68k/stand/boot_ufs/readufs.h,v
retrieving revision 1.12
diff -u -r1.12 readufs.h
--- readufs.h	18 Jun 2013 18:18:58 -0000	1.12
+++ readufs.h	17 Aug 2015 10:49:02 -0000
@@ -26,8 +26,8 @@
 	struct ufs2_dinode di2;
 #endif
 #ifdef USE_LFS
-	struct ulfs1_dinode dil1;
-	struct ulfs2_dinode dil2;
+	struct lfs32_dinode dil1;
+	struct lfs64_dinode dil2;
 #endif
 };
 
Index: readufs_lfs.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c,v
retrieving revision 1.16
diff -u -r1.16 readufs_lfs.c
--- readufs_lfs.c	28 Jul 2015 16:51:25 -0000	1.16
+++ readufs_lfs.c	17 Aug 2015 10:49:02 -0000
@@ -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 @@
 	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. */
@@ -174,9 +174,9 @@
 			 ino / fsi_lfs.ifpb + fsi_lfs.ioffset,
 			 fsi.bsize);
 		i = ino % fsi_lfs.ifpb;
-		daddr = (fsi_lfs.version == 1) ?
-		    ((IFILE_V1 *) buf + i)->if_daddr
-		    : ((IFILE *) buf + i)->if_daddr;
+		daddr = (fsi_lfs.version == 1)
+		    ? ((IFILE32 *) buf + i)->if_daddr
+		    : ((IFILE64 *) buf + i)->if_daddr;
 	}
 #ifdef DEBUG_WITH_STDIO
 	printf("LFS(%d): daddr: %d\n", ino, (int) daddr);
@@ -195,7 +195,7 @@
 	);
 
 	/* Search for the inode. */
-	di = (struct ulfs1_dinode *) buf;
+	di = (struct lfs32_dinode *) buf;
 	diend = di + fsi_lfs.inopb;
 
 	for ( ; di < diend; di++)

---
Tetsuya Isaki <isaki%pastel-flower.jp@localhost / isaki%NetBSD.org@localhost>