Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sbin/fsck_lfs/setup.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sbin/fsck_lfs/setup.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.38.2.2
retrieving revision 1.39
diff -u -p -r1.38.2.2 -r1.39
--- src/sbin/fsck_lfs/setup.c	2014/05/22 11:37:28	1.38.2.2
+++ src/sbin/fsck_lfs/setup.c	2013/01/22 09:39:12	1.39
@@ -1,4 +1,4 @@
-/* $NetBSD: setup.c,v 1.38.2.2 2014/05/22 11:37:28 yamt Exp $ */
+/* $NetBSD: setup.c,v 1.39 2013/01/22 09:39:12 dholland Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -71,9 +71,10 @@
 #include <sys/disk.h>
 #include <sys/file.h>
 
+#include <ufs/ufs/inode.h>
+#include <ufs/ufs/ufsmount.h>
 #define vnode uvnode
 #include <ufs/lfs/lfs.h>
-#include <ufs/lfs/lfs_inode.h>
 #undef vnode
 
 #include <ctype.h>
@@ -97,7 +98,7 @@
 extern u_int32_t cksum(void *, size_t);
 static uint64_t calcmaxfilesize(int);
 
-ulfs_daddr_t *din_table;
+ufs_daddr_t *din_table;
 SEGUSE *seg_table;
 
 #ifdef DKTYPENAMES
@@ -123,7 +124,7 @@ calcmaxfilesize(int bshift)
 	uint64_t maxblock;
 
 	nptr = (1 << bshift) / sizeof(uint32_t);
-	maxblock = ULFS_NDADDR + nptr + nptr * nptr + nptr * nptr * nptr;
+	maxblock = UFS_NDADDR + nptr + nptr * nptr + nptr * nptr * nptr;
 
 	return maxblock << bshift;
 }
@@ -238,13 +239,13 @@ setup(const char *dev)
 		if (debug)
 			pwarn("adjusting offset, serial for -i 0x%lx\n",
 				(unsigned long)idaddr);
-		tdaddr = lfs_sntod(fs, lfs_dtosn(fs, idaddr));
-		if (lfs_sntod(fs, lfs_dtosn(fs, tdaddr)) == tdaddr) {
+		tdaddr = sntod(fs, dtosn(fs, idaddr));
+		if (sntod(fs, dtosn(fs, tdaddr)) == tdaddr) {
 			if (tdaddr == fs->lfs_start)
-				tdaddr += lfs_btofsb(fs, LFS_LABELPAD);
+				tdaddr += btofsb(fs, LFS_LABELPAD);
 			for (i = 0; i < LFS_MAXNUMSB; i++) {
 				if (fs->lfs_sboffs[i] == tdaddr)
-					tdaddr += lfs_btofsb(fs, LFS_SBPAD);
+					tdaddr += btofsb(fs, LFS_SBPAD);
 				if (fs->lfs_sboffs[i] > tdaddr)
 					break;
 			}
@@ -254,7 +255,7 @@ setup(const char *dev)
 			pwarn("begin with offset/serial 0x%x/%d\n",
 				(int)fs->lfs_offset, (int)fs->lfs_serial);
 		while (tdaddr < idaddr) {
-			bread(fs->lfs_devvp, LFS_FSBTODB(fs, tdaddr),
+			bread(fs->lfs_devvp, fsbtodb(fs, tdaddr),
 			      fs->lfs_sumsize,
 			      NULL, 0, &bp);
 			sp = (SEGSUM *)bp->b_data;
@@ -268,7 +269,7 @@ setup(const char *dev)
 				break;
 			}
 			fp = (FINFO *)(sp + 1);
-			bc = howmany(sp->ss_ninos, LFS_INOPB(fs)) <<
+			bc = howmany(sp->ss_ninos, INOPB(fs)) <<
 				(fs->lfs_version > 1 ? fs->lfs_ffshift :
 						       fs->lfs_bshift);
 			for (i = 0; i < sp->ss_nfinfo; i++) {
@@ -277,7 +278,7 @@ setup(const char *dev)
 				fp = (FINFO *)(fp->fi_blocks + fp->fi_nblocks);
 			}
 
-			tdaddr += lfs_btofsb(fs, bc) + 1;
+			tdaddr += btofsb(fs, bc) + 1;
 			fs->lfs_offset = tdaddr;
 			fs->lfs_serial = sp->ss_serial + 1;
 			brelse(bp, 0);
@@ -287,8 +288,8 @@ setup(const char *dev)
 		 * Set curseg, nextseg appropriately -- inlined from
 		 * lfs_newseg()
 		 */
-		curseg = lfs_dtosn(fs, fs->lfs_offset);
-		fs->lfs_curseg = lfs_sntod(fs, curseg);
+		curseg = dtosn(fs, fs->lfs_offset);
+		fs->lfs_curseg = sntod(fs, curseg);
 		for (sn = curseg + fs->lfs_interleave;;) {  
 			sn = (sn + 1) % fs->lfs_nseg;
 			if (sn == curseg)
@@ -304,10 +305,10 @@ setup(const char *dev)
 		/* Skip superblock if necessary */
 		for (i = 0; i < LFS_MAXNUMSB; i++)
 			if (fs->lfs_offset == fs->lfs_sboffs[i])
-				fs->lfs_offset += lfs_btofsb(fs, LFS_SBPAD);
+				fs->lfs_offset += btofsb(fs, LFS_SBPAD);
 
 		++fs->lfs_nactive;
-		fs->lfs_nextseg = lfs_sntod(fs, sn);
+		fs->lfs_nextseg = sntod(fs, sn);
 		if (debug) {
 			pwarn("offset = 0x%" PRIx32 ", serial = %" PRId64 "\n",
 				fs->lfs_offset, fs->lfs_serial);
@@ -387,10 +388,10 @@ setup(const char *dev)
 			sbdirty();
 		}
 	}
-	if (fs->lfs_maxsymlinklen != ULFS1_MAXSYMLINKLEN) {
+	if (fs->lfs_maxsymlinklen != UFS1_MAXSYMLINKLEN) {
 		pwarn("INCORRECT MAXSYMLINKLEN=%d IN SUPERBLOCK",
 		    fs->lfs_maxsymlinklen);
-		fs->lfs_maxsymlinklen = ULFS1_MAXSYMLINKLEN;
+		fs->lfs_maxsymlinklen = UFS1_MAXSYMLINKLEN;
 		if (preen)
 			printf(" (FIXED)\n");
 		if (preen || reply("FIX") == 1) {
@@ -432,7 +433,7 @@ setup(const char *dev)
 
 	/* Initialize Ifile entry */
 	din_table[fs->lfs_ifile] = fs->lfs_idaddr;
-	seg_table[lfs_dtosn(fs, fs->lfs_idaddr)].su_nbytes += LFS_DINODE1_SIZE;
+	seg_table[dtosn(fs, fs->lfs_idaddr)].su_nbytes += DINODE1_SIZE;
 
 #ifndef VERBOSE_BLOCKMAP
 	bmapsize = roundup(howmany(maxfsblock, NBBY), sizeof(int16_t));