diff --exclude=.svn -ur src/sbin/fsck_ffs/Makefile src/sbin/fsck_ifs/Makefile
--- src/sbin/fsck_ffs/Makefile	Tue Apr 12 23:45:28 2005
+++ src/sbin/fsck_ifs/Makefile	Sun Jun  5 10:04:11 2005
@@ -1,15 +1,15 @@
 # $FreeBSD: src/sbin/fsck_ffs/Makefile,v 1.16 2004/09/01 08:26:39 scottl Exp $
 #	@(#)Makefile	8.2 (Berkeley) 4/27/95
 
-PROG=	fsck_ffs
-LINKS+=	${BINDIR}/fsck_ffs ${BINDIR}/fsck_ufs
-LINKS+=	${BINDIR}/fsck_ffs ${BINDIR}/fsck_4.2bsd
+PROG=	fsck_ifs
+#LINKS+=	${BINDIR}/fsck_ffs ${BINDIR}/fsck_ufs
+#LINKS+=	${BINDIR}/fsck_ffs ${BINDIR}/fsck_4.2bsd
 MAN=	fsck_ffs.8
 MLINKS=	fsck_ffs.8 fsck_ufs.8 fsck_ffs.8 fsck_4.2bsd.8
 SRCS=	dir.c ea.c fsutil.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c \
 	pass4.c pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c
 WARNS?=	2
-CFLAGS+= -I${.CURDIR}
+CFLAGS+= -I${.CURDIR} -g
 
 .PATH:	${.CURDIR}/../../sys/ufs/ffs
 
Only in src/sbin/fsck_ffs: SMM.doc
diff --exclude=.svn -ur src/sbin/fsck_ffs/main.c src/sbin/fsck_ifs/main.c
--- src/sbin/fsck_ffs/main.c	Tue Apr 12 23:45:28 2005
+++ src/sbin/fsck_ifs/main.c	Sun Jun  5 09:20:52 2005
@@ -306,7 +306,7 @@
 			    "%s/.snap/fsck_snapshot", mntp->f_mntonname);
 			memset(&args, 0, sizeof args);
 			args.fspec = snapname;
-			while (mount("ffs", mntp->f_mntonname,
+			while (mount("ifs", mntp->f_mntonname,
 			    mntp->f_flags | MNT_UPDATE | MNT_SNAPSHOT,
 			    &args) < 0) {
 				if (errno == EEXIST && unlink(snapname) == 0)
diff --exclude=.svn -ur src/sbin/fsck_ffs/pass2.c src/sbin/fsck_ifs/pass2.c
--- src/sbin/fsck_ffs/pass2.c	Tue Apr 12 23:45:28 2005
+++ src/sbin/fsck_ifs/pass2.c	Sun Jun  5 09:28:48 2005
@@ -189,6 +189,7 @@
 		curino.id_parent = inp->i_parent;
 		(void)ckinode(dp, &curino);
 	}
+#if 0
 	/*
 	 * Now that the parents of all directories have been found,
 	 * make another pass to verify the value of `..'
@@ -221,6 +222,7 @@
 		inp->i_dotdot = inp->i_parent;
 		(void)changeino(inp->i_number, "..", inp->i_parent);
 	}
+#endif
 	/*
 	 * Mark all the directories that can be found from the root.
 	 */
@@ -232,13 +234,14 @@
 {
 	struct direct *dirp = idesc->id_dirp;
 	struct inoinfo *inp;
-	int n, entrysize, ret = 0;
+	int n, /* entrysize ,*/ ret = 0;
 	union dinode *dp;
 	const char *errmsg;
-	struct direct proto;
+//	struct direct proto;
 	char namebuf[MAXPATHLEN + 1];
 	char pathbuf[MAXPATHLEN + 1];
 
+#if 0
 	/*
 	 * check for "."
 	 */
@@ -363,6 +366,7 @@
 			return (KEEPON | ret);
 		}
 	}
+#endif
 	idesc->id_entryno++;
 	n = 0;
 	if (dirp->d_ino > maxino) {
diff --exclude=.svn -ur src/sbin/fsck_ffs/pass4.c src/sbin/fsck_ifs/pass4.c
--- src/sbin/fsck_ffs/pass4.c	Tue Apr 12 23:45:28 2005
+++ src/sbin/fsck_ifs/pass4.c	Sun Jun  5 10:20:54 2005
@@ -78,6 +78,7 @@
 			case FZLINK:
 			case DZLINK:
 				if (inoinfo(inumber)->ino_linkcnt == 0) {
+					printf("FZLINK DZLINK\n");
 					clri(&idesc, "UNREF", 1);
 					break;
 				}
@@ -86,13 +87,15 @@
 			case FSTATE:
 			case DFOUND:
 				n = inoinfo(inumber)->ino_linkcnt;
-				if (n) {
+				if (n > 1) {
+					printf("FSTATE DFOUND %d\n", n);
 					adjust(&idesc, (short)n);
 					break;
 				}
 				break;
 
 			case DSTATE:
+				printf("DSTATE\n");
 				clri(&idesc, "UNREF", 1);
 				break;
 
diff --exclude=.svn -ur src/sbin/mount_ufs/Makefile src/sbin/mount_ifs/Makefile
--- src/sbin/mount_ufs/Makefile	Tue Apr 12 23:45:29 2005
+++ src/sbin/mount_ifs/Makefile	Sat Jun  4 17:47:28 2005
@@ -1,6 +1,6 @@
 # $FreeBSD: src/sbin/mount_ufs/Makefile,v 1.2 2004/12/21 09:59:43 ru Exp $
 
-PROG=	mount_ufs
+PROG=	mount_ifs
 SRCS=	mount_ufs.c getmntopts.c
 MAN=	mount_ufs.8
 
Only in src/sbin/mount_ifs: getmntopts.o
diff --exclude=.svn -ur src/sbin/mount_ufs/mount_ufs.c src/sbin/mount_ifs/mount_ufs.c
--- src/sbin/mount_ufs/mount_ufs.c	Sat Jun  4 07:58:24 2005
+++ src/sbin/mount_ifs/mount_ufs.c	Sat Jun  4 18:25:02 2005
@@ -116,10 +116,10 @@
 
 	iov = NULL;
 	iovlen = 0;
-	build_iovec(&iov, &iovlen, "fstype", "ufs", -1);
+	build_iovec(&iov, &iovlen, "fstype", "ifs", -1);
 	build_iovec(&iov, &iovlen, "fspath", mntpath, -1);
 	build_iovec(&iov, &iovlen, "from", dev, -1);
-	build_iovec(&iov, &iovlen, "flags", &ufs_flags, sizeof ufs_flags);
+	//build_iovec(&iov, &iovlen, "flags", &ufs_flags, sizeof ufs_flags);
 	build_iovec(&iov, &iovlen, "export", &export, sizeof export);
 	if (nmount(iov, iovlen, mntflags) < 0)
 		err(1, "%s", dev);
Only in src/sbin/mount_ifs: old