break UFS up into FFS/UFS/LFS/MFS

SCCS-vsn: sbin/ncheck/ncheck.c 5.14
SCCS-vsn: sbin/quotacheck/quotacheck.c 5.17
SCCS-vsn: sbin/tunefs/tunefs.c 5.12
SCCS-vsn: sbin/restore/dirs.c 5.18
SCCS-vsn: sbin/restore/interactive.c 5.11
SCCS-vsn: sbin/restore/restore.h 5.10

diff --git a/usr/src/sbin/ncheck/ncheck.c b/usr/src/sbin/ncheck/ncheck.c
index 0c155e1..9596ff8 100644 (file)
--- a/usr/src/sbin/ncheck/ncheck.c
+++ b/usr/src/sbin/ncheck/ncheck.c
@@ -12,7 +12,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

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

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


@@ -23,9 +23,9 @@ static char sccsid[] = "@(#)ncheck.c  5.13 (Berkeley) %G%";
 #define        MAXNINDIR       (MAXBSIZE / sizeof (daddr_t))
 
 #include <sys/param.h>
 #define        MAXNINDIR       (MAXBSIZE / sizeof (daddr_t))
 
 #include <sys/param.h>

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

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

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

 #include <stdio.h>
 
 struct fs      sblock;
 #include <stdio.h>
 
 struct fs      sblock;

diff --git a/usr/src/sbin/quotacheck/quotacheck.c b/usr/src/sbin/quotacheck/quotacheck.c
index 763d096..668af6f 100644 (file)
--- a/usr/src/sbin/quotacheck/quotacheck.c
+++ b/usr/src/sbin/quotacheck/quotacheck.c
@@ -15,7 +15,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

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

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


@@ -23,9 +23,9 @@ static char sccsid[] = "@(#)quotacheck.c      5.16 (Berkeley) %G%";
  */
 #include <sys/param.h>
 #include <sys/stat.h>
  */
 #include <sys/param.h>
 #include <sys/stat.h>

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

 #include <fcntl.h>
 #include <fstab.h>
 #include <pwd.h>
 #include <fcntl.h>
 #include <fstab.h>
 #include <pwd.h>

diff --git a/usr/src/sbin/restore/dirs.c b/usr/src/sbin/restore/dirs.c
index 0c26e9c..84bb449 100644 (file)
--- a/usr/src/sbin/restore/dirs.c
+++ b/usr/src/sbin/restore/dirs.c
@@ -6,13 +6,13 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

 #endif /* not lint */
 
 #include "restore.h"
 #include <protocols/dumprestore.h>
 #include <sys/file.h>
 #endif /* not lint */
 
 #include "restore.h"
 #include <protocols/dumprestore.h>
 #include <sys/file.h>

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

 #include "pathnames.h"
 
 /*
 #include "pathnames.h"
 
 /*

diff --git a/usr/src/sbin/restore/interactive.c b/usr/src/sbin/restore/interactive.c
index ae3c5c2..538cf6b 100644 (file)
--- a/usr/src/sbin/restore/interactive.c
+++ b/usr/src/sbin/restore/interactive.c
@@ -6,13 +6,13 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

 #endif /* not lint */
 
 #include "restore.h"
 #include <protocols/dumprestore.h>
 #include <setjmp.h>
 #endif /* not lint */
 
 #include "restore.h"
 #include <protocols/dumprestore.h>
 #include <setjmp.h>

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

 
 #define round(a, b) (((a) + (b) - 1) / (b) * (b))
 
 
 #define round(a, b) (((a) + (b) - 1) / (b) * (b))
 

diff --git a/usr/src/sbin/restore/restore.h b/usr/src/sbin/restore/restore.h
index bee57c5..7e26a15 100644 (file)
--- a/usr/src/sbin/restore/restore.h
+++ b/usr/src/sbin/restore/restore.h
@@ -4,14 +4,14 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)restore.h   5.9 (Berkeley) %G%
+ *     @(#)restore.h   5.10 (Berkeley) %G%

  */
 
  */
 

-#include <stdio.h>

 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/param.h>
 #include <sys/time.h>

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

 
 /*
  * Flags
 
 /*
  * Flags

diff --git a/usr/src/sbin/tunefs/tunefs.c b/usr/src/sbin/tunefs/tunefs.c
index a7922d9..7f8d427 100644 (file)
--- a/usr/src/sbin/tunefs/tunefs.c
+++ b/usr/src/sbin/tunefs/tunefs.c
@@ -12,7 +12,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

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

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


@@ -20,7 +20,7 @@ static char sccsid[] = "@(#)tunefs.c  5.11 (Berkeley) %G%";
  */
 #include <sys/param.h>
 #include <sys/stat.h>
  */
 #include <sys/param.h>
 #include <sys/stat.h>

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

 #include <fstab.h>
 #include <stdio.h>
 #include <paths.h>
 #include <fstab.h>
 #include <stdio.h>
 #include <paths.h>