break FFS into UFS/FFS/LFS

SCCS-vsn: lib/libc/gen/disklabel.c 5.18
SCCS-vsn: sbin/fsck/dir.c 5.20
SCCS-vsn: sbin/fsck/inode.c 5.19
SCCS-vsn: sbin/fsck/main.c 5.29
SCCS-vsn: sbin/fsck/pass1.c 5.17
SCCS-vsn: sbin/fsck/pass1b.c 5.9
SCCS-vsn: sbin/fsck/pass2.c 5.18
SCCS-vsn: sbin/fsck/pass3.c 5.11
SCCS-vsn: sbin/fsck/pass4.c 5.11
SCCS-vsn: sbin/fsck/pass5.c 5.14
SCCS-vsn: sbin/fsck/setup.c 5.34
SCCS-vsn: sbin/fsck/utilities.c 5.31
SCCS-vsn: sbin/newfs/mkfs.c 6.19
SCCS-vsn: sbin/newfs/newfs.c 6.29

diff --git a/usr/src/lib/libc/gen/disklabel.c b/usr/src/lib/libc/gen/disklabel.c
index 2aa2394..4957c76 100644 (file)
--- a/usr/src/lib/libc/gen/disklabel.c
+++ b/usr/src/lib/libc/gen/disklabel.c
@@ -6,15 +6,15 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)disklabel.c        5.17 (Berkeley) %G%";
+static char sccsid[] = "@(#)disklabel.c        5.18 (Berkeley) %G%";

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

-#include <ufs/fs.h>

 #include <sys/file.h>
 #define DKTYPENAMES
 #include <sys/disklabel.h>
 #include <sys/file.h>
 #define DKTYPENAMES
 #include <sys/disklabel.h>

+#include <ufs/ffs/fs.h>

 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

diff --git a/usr/src/sbin/fsck/dir.c b/usr/src/sbin/fsck/dir.c
index 6d7f1fd..52119d1 100644 (file)
--- a/usr/src/sbin/fsck/dir.c
+++ b/usr/src/sbin/fsck/dir.c
@@ -6,15 +6,15 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)dir.c      5.19 (Berkeley) %G%";
+static char sccsid[] = "@(#)dir.c      5.20 (Berkeley) %G%";

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

-#include <ufs/dinode.h>
-#include <ufs/fs.h>
+#include <ufs/ufs/dinode.h>

 #define KERNEL
 #define KERNEL

-#include <ufs/dir.h>
+#include <ufs/ufs/dir.h>

 #undef KERNEL
 #undef KERNEL

+#include <ufs/ffs/fs.h>

 #include <stdlib.h>
 #include <string.h>
 #include "fsck.h"
 #include <stdlib.h>
 #include <string.h>
 #include "fsck.h"

diff --git a/usr/src/sbin/fsck/inode.c b/usr/src/sbin/fsck/inode.c
index 90ef6a3..9c02638 100644 (file)
--- a/usr/src/sbin/fsck/inode.c
+++ b/usr/src/sbin/fsck/inode.c
@@ -6,13 +6,13 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)inode.c    5.18 (Berkeley) %G%";
+static char sccsid[] = "@(#)inode.c    5.19 (Berkeley) %G%";

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

-#include <ufs/dinode.h>
-#include <ufs/fs.h>
-#include <ufs/dir.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ufs/dir.h>
+#include <ufs/ffs/fs.h>

 #include <pwd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <pwd.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/usr/src/sbin/fsck/main.c b/usr/src/sbin/fsck/main.c
index ea7d1ff..0bcd7db 100644 (file)
--- a/usr/src/sbin/fsck/main.c
+++ b/usr/src/sbin/fsck/main.c
@@ -12,12 +12,12 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.28 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     5.29 (Berkeley) %G%";

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

-#include <ufs/dinode.h>
-#include <ufs/fs.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ffs/fs.h>

 #include <fstab.h>
 #include <stdlib.h>
 #include <string.h>
 #include <fstab.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/usr/src/sbin/fsck/pass1.c b/usr/src/sbin/fsck/pass1.c
index 7eff291..9ec72f2 100644 (file)
--- a/usr/src/sbin/fsck/pass1.c
+++ b/usr/src/sbin/fsck/pass1.c
@@ -6,12 +6,12 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)pass1.c    5.16 (Berkeley) %G%";
+static char sccsid[] = "@(#)pass1.c    5.17 (Berkeley) %G%";

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

-#include <ufs/dinode.h>
-#include <ufs/fs.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ffs/fs.h>

 #include <stdlib.h>
 #include <string.h>
 #include "fsck.h"
 #include <stdlib.h>
 #include <string.h>
 #include "fsck.h"

diff --git a/usr/src/sbin/fsck/pass1b.c b/usr/src/sbin/fsck/pass1b.c
index 920df1a..ec5f216 100644 (file)
--- a/usr/src/sbin/fsck/pass1b.c
+++ b/usr/src/sbin/fsck/pass1b.c
@@ -6,12 +6,12 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)pass1b.c   5.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)pass1b.c   5.9 (Berkeley) %G%";

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

-#include <ufs/dinode.h>
-#include <ufs/fs.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ffs/fs.h>

 #include <string.h>
 #include "fsck.h"
 
 #include <string.h>
 #include "fsck.h"
 

diff --git a/usr/src/sbin/fsck/pass2.c b/usr/src/sbin/fsck/pass2.c
index c4d3683..e214799 100644 (file)
--- a/usr/src/sbin/fsck/pass2.c
+++ b/usr/src/sbin/fsck/pass2.c
@@ -6,15 +6,15 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)pass2.c    5.17 (Berkeley) %G%";
+static char sccsid[] = "@(#)pass2.c    5.18 (Berkeley) %G%";

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

-#include <ufs/dinode.h>
-#include <ufs/fs.h>
+#include <ufs/ufs/dinode.h>

 #define KERNEL
 #define KERNEL

-#include <ufs/dir.h>
+#include <ufs/ufs/dir.h>

 #undef KERNEL
 #undef KERNEL

+#include <ufs/ffs/fs.h>

 #include <stdlib.h>
 #include <string.h>
 #include "fsck.h"
 #include <stdlib.h>
 #include <string.h>
 #include "fsck.h"

diff --git a/usr/src/sbin/fsck/pass3.c b/usr/src/sbin/fsck/pass3.c
index 8d8531a..405fa75 100644 (file)
--- a/usr/src/sbin/fsck/pass3.c
+++ b/usr/src/sbin/fsck/pass3.c
@@ -6,12 +6,12 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)pass3.c    5.10 (Berkeley) %G%";
+static char sccsid[] = "@(#)pass3.c    5.11 (Berkeley) %G%";

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

-#include <ufs/dinode.h>
-#include <ufs/fs.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ffs/fs.h>

 #include "fsck.h"
 
 pass3()
 #include "fsck.h"
 
 pass3()

diff --git a/usr/src/sbin/fsck/pass4.c b/usr/src/sbin/fsck/pass4.c
index 34f6f6a..1637289 100644 (file)
--- a/usr/src/sbin/fsck/pass4.c
+++ b/usr/src/sbin/fsck/pass4.c
@@ -6,12 +6,12 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)pass4.c    5.10 (Berkeley) %G%";
+static char sccsid[] = "@(#)pass4.c    5.11 (Berkeley) %G%";

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

-#include <ufs/dinode.h>
-#include <ufs/fs.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ffs/fs.h>

 #include <stdlib.h>
 #include <string.h>
 #include "fsck.h"
 #include <stdlib.h>
 #include <string.h>
 #include "fsck.h"

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

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

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

-#include <ufs/dinode.h>
-#include <ufs/fs.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ffs/fs.h>

 #include <string.h>
 #include "fsck.h"
 
 #include <string.h>
 #include "fsck.h"
 

diff --git a/usr/src/sbin/fsck/setup.c b/usr/src/sbin/fsck/setup.c
index 2ebd25e..d343aae 100644 (file)
--- a/usr/src/sbin/fsck/setup.c
+++ b/usr/src/sbin/fsck/setup.c
@@ -6,13 +6,13 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)setup.c    5.33 (Berkeley) %G%";
+static char sccsid[] = "@(#)setup.c    5.34 (Berkeley) %G%";

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

-#include <ufs/dinode.h>
-#include <ufs/fs.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ffs/fs.h>

 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/disklabel.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/disklabel.h>

diff --git a/usr/src/sbin/fsck/utilities.c b/usr/src/sbin/fsck/utilities.c
index b4ae9e9..b589f5e 100644 (file)
--- a/usr/src/sbin/fsck/utilities.c
+++ b/usr/src/sbin/fsck/utilities.c
@@ -6,13 +6,13 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)utilities.c        5.30 (Berkeley) %G%";
+static char sccsid[] = "@(#)utilities.c        5.31 (Berkeley) %G%";

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

-#include <ufs/dinode.h>
-#include <ufs/fs.h>
-#include <ufs/dir.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ufs/dir.h>
+#include <ufs/ffs/fs.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/usr/src/sbin/newfs/mkfs.c b/usr/src/sbin/newfs/mkfs.c
index 84f2e2f..ef5113e 100644 (file)
--- a/usr/src/sbin/newfs/mkfs.c
+++ b/usr/src/sbin/newfs/mkfs.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)mkfs.c     6.18 (Berkeley) %G%";
+static char sccsid[] = "@(#)mkfs.c     6.19 (Berkeley) %G%";

 #endif /* not lint */
 
 #ifndef STANDALONE
 #endif /* not lint */
 
 #ifndef STANDALONE


@@ -18,11 +18,10 @@ static char sccsid[] = "@(#)mkfs.c  6.18 (Berkeley) %G%";
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <sys/resource.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <sys/resource.h>

-#include <ufs/dinode.h>
-#include <ufs/fs.h>
-#include <ufs/dir.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ufs/dir.h>
+#include <ufs/ffs/fs.h>

 #include <sys/disklabel.h>
 #include <sys/disklabel.h>

-#include <machine/endian.h>

 
 /*
  * make file system for cylinder-group style file systems
 
 /*
  * make file system for cylinder-group style file systems

diff --git a/usr/src/sbin/newfs/newfs.c b/usr/src/sbin/newfs/newfs.c
index d8bf1e3..508461e 100644 (file)
--- a/usr/src/sbin/newfs/newfs.c
+++ b/usr/src/sbin/newfs/newfs.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)newfs.c    6.28 (Berkeley) %G%";
+static char sccsid[] = "@(#)newfs.c    6.29 (Berkeley) %G%";

 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint


@@ -20,12 +20,12 @@ char copyright[] =
  */
 #include <sys/param.h>
 #include <sys/stat.h>
  */
 #include <sys/param.h>
 #include <sys/stat.h>

-#include <ufs/fs.h>
-#include <ufs/dir.h>

 #include <sys/ioctl.h>
 #include <sys/disklabel.h>
 #include <sys/file.h>
 #include <sys/mount.h>
 #include <sys/ioctl.h>
 #include <sys/disklabel.h>
 #include <sys/file.h>
 #include <sys/mount.h>

+#include <ufs/ufs/dir.h>
+#include <ufs/ffs/fs.h>

 
 #include <errno.h>
 #if __STDC__
 
 #include <errno.h>
 #if __STDC__