break UFS up into FFS/UFS/LFS/MFS

SCCS-vsn: sbin/fsck/Makefile 5.16
SCCS-vsn: sbin/fsck/pass5.c 5.15

diff --git a/usr/src/sbin/fsck/Makefile b/usr/src/sbin/fsck/Makefile
index f3e2689..96260c1 100644 (file)
--- a/usr/src/sbin/fsck/Makefile
+++ b/usr/src/sbin/fsck/Makefile
@@ -3,7 +3,7 @@
 PROG=  fsck
 MAN8=  fsck.0
 SRCS=  dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
 PROG=  fsck
 MAN8=  fsck.0
 SRCS=  dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \

-       pass5.c preen.c setup.c utilities.c ufs_subr.c ufs_tables.c
-.PATH: ${.CURDIR}/../../sys/ufs
+       pass5.c preen.c setup.c utilities.c ffs_subr.c ffs_tables.c
+.PATH: ${.CURDIR}/../../sys/ufs/ffs

 
 .include <bsd.prog.mk>
 
 .include <bsd.prog.mk>

diff --git a/usr/src/sbin/fsck/pass5.c b/usr/src/sbin/fsck/pass5.c
index 84b4605..965df99 100644 (file)
--- a/usr/src/sbin/fsck/pass5.c
+++ b/usr/src/sbin/fsck/pass5.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)pass5.c    5.14 (Berkeley) %G%";
+static char sccsid[] = "@(#)pass5.c    5.15 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -163,7 +163,7 @@ pass5()
                        } else if (frags > 0) {
                                newcg->cg_cs.cs_nffree += frags;
                                blk = blkmap(fs, cg_blksfree(newcg), i);
                        } else if (frags > 0) {
                                newcg->cg_cs.cs_nffree += frags;
                                blk = blkmap(fs, cg_blksfree(newcg), i);

-                               fragacct(fs, blk, newcg->cg_frsum, 1);
+                               ffs_fragacct(fs, blk, newcg->cg_frsum, 1);

                        }
                }
                cstotal.cs_nffree += newcg->cg_cs.cs_nffree;
                        }
                }
                cstotal.cs_nffree += newcg->cg_cs.cs_nffree;