Index: Makefile
===================================================================
RCS file: /home/ncvs/src/sbin/fsck_ffs/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile	2000/10/09 09:21:04	1.7
+++ Makefile	2000/10/14 02:25:46
@@ -1,10 +1,8 @@
 # $FreeBSD: src/sbin/fsck_ffs/Makefile,v 1.7 2000/10/09 09:21:04 adrian 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
-MAN8=	fsck_ffs.8
+PROG=	fsck_ifs
+NOMAN=	true
 SRCS=	dir.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
 CFLAGS+=-W
Index: main.c
===================================================================
RCS file: /home/ncvs/src/sbin/fsck_ffs/main.c,v
retrieving revision 1.22
diff -u -r1.22 main.c
--- main.c	2000/10/09 08:26:28	1.22
+++ main.c	2000/10/14 02:24:55
@@ -241,9 +241,12 @@
 	/*
 	 * 2: traverse directories from root to mark all connected directories
 	 */
+#ifdef NOTFORIFS
 	if (preen == 0)
 		printf("** Phase 2 - Check Pathnames\n");
 	pass2();
+#endif
+	printf("** Skipping phase 2 for IFS\n");
 
 	/*
 	 * 3: scan inodes looking for disconnected directories
@@ -345,7 +348,7 @@
 			args.fspec = 0;
 			args.export.ex_flags = 0;
 			args.export.ex_root = 0;
-			ret = mount("ufs", mntbuf->f_mntonname,
+			ret = mount("ifs", mntbuf->f_mntonname,
 			    mntbuf->f_flags | MNT_UPDATE | MNT_RELOAD, &args);
 			if (ret == 0)
 				return (0);
@@ -380,7 +383,7 @@
 		return (NULL);
 	mntsize = getmntinfo(&mntbuf, MNT_NOWAIT);
 	for (i = 0; i < mntsize; i++) {
-		if (strcmp(mntbuf[i].f_fstypename, "ufs") != 0)
+		if (strcmp(mntbuf[i].f_fstypename, "ifs") != 0)
 			continue;
 		devname = mntbuf[i].f_mntfromname;
 		if (*devname != '/') {
Index: pass4.c
===================================================================
RCS file: /home/ncvs/src/sbin/fsck_ffs/pass4.c,v
retrieving revision 1.7
diff -u -r1.7 pass4.c
--- pass4.c	1999/08/28 00:12:47	1.7
+++ pass4.c	2000/10/14 02:24:12
@@ -73,9 +73,12 @@
 			case DFOUND:
 				n = inoinfo(inumber)->ino_linkcnt;
 				if (n) {
+#if NOTFORIFS
 					adjust(&idesc, (short)n);
+#endif
 					break;
 				}
+#if NOTFORIFS
 				for (zlnp = zlnhead; zlnp; zlnp = zlnp->next) {
 					if (zlnp->zlncnt == inumber) {
 						zlnp->zlncnt = zlnhead->zlncnt;
@@ -86,10 +89,10 @@
 						break;
 					}
 				}
+#endif
 				break;
 
 			case DSTATE:
-				clri(&idesc, "UNREF", 1);
 				break;
 
 			case DCLEAR:
Index: setup.c
===================================================================
RCS file: /home/ncvs/src/sbin/fsck_ffs/setup.c,v
retrieving revision 1.18
diff -u -r1.18 setup.c
--- setup.c	2000/07/06 02:03:11	1.18
+++ setup.c	2000/10/14 02:23:53
@@ -292,10 +292,12 @@
 	}
 	numdirs = sblock.fs_cstotal.cs_ndir;
 	dirhash = numdirs;
+#if NOTFORIFS
 	if (numdirs == 0) {
 		printf("numdirs is zero, try using an alternate superblock\n");
 		goto badsb;
 	}
+#endif
 	inplast = 0;
 	listmax = numdirs + 10;
 	inpsort = (struct inoinfo **)calloc((unsigned)listmax,