vnodes

SCCS-vsn: sbin/dump/dumprmt.c 5.7
SCCS-vsn: sbin/dumpfs/dumpfs.c 5.8
SCCS-vsn: sbin/fsdb/fsdb.c 5.6
SCCS-vsn: sbin/icheck/icheck.c 5.5
SCCS-vsn: sbin/ncheck/ncheck.c 5.8
SCCS-vsn: sbin/quotacheck/quotacheck.c 5.11

diff --git a/usr/src/sbin/dump/dumprmt.c b/usr/src/sbin/dump/dumprmt.c
index 00421f1..216718b 100644 (file)
--- a/usr/src/sbin/dump/dumprmt.c
+++ b/usr/src/sbin/dump/dumprmt.c
@@ -5,14 +5,16 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)dumprmt.c  5.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)dumprmt.c  5.7 (Berkeley) %G%";

 #endif not lint
 
 #include <sys/param.h>
 #include <sys/mtio.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #endif not lint
 
 #include <sys/param.h>
 #include <sys/mtio.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>

-#include <sys/inode.h>
+#include <sys/time.h>
+#include <sys/vnode.h>
+#include <ufs/inode.h>

 
 #include <netinet/in.h>
 
 
 #include <netinet/in.h>
 

diff --git a/usr/src/sbin/dumpfs/dumpfs.c b/usr/src/sbin/dumpfs/dumpfs.c
index 9df13ac..a5f03cc 100644 (file)
--- a/usr/src/sbin/dumpfs/dumpfs.c
+++ b/usr/src/sbin/dumpfs/dumpfs.c
@@ -22,12 +22,14 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

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

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

-#include <sys/inode.h>
-#include <sys/fs.h>
+#include <sys/time.h>
+#include <sys/vnode.h>
+#include <ufs/inode.h>
+#include <ufs/fs.h>

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

diff --git a/usr/src/sbin/fsdb/fsdb.c b/usr/src/sbin/fsdb/fsdb.c
index 3680e30..120486c 100644 (file)
--- a/usr/src/sbin/fsdb/fsdb.c
+++ b/usr/src/sbin/fsdb/fsdb.c
@@ -25,7 +25,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)fsdb.c     5.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)fsdb.c     5.6 (Berkeley) %G%";

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


@@ -42,21 +42,14 @@ static char sccsid[] = "@(#)fsdb.c  5.5 (Berkeley) %G%";
 #include <sys/param.h>
 #include <sys/signal.h>
 #include <sys/file.h>
 #include <sys/param.h>
 #include <sys/signal.h>
 #include <sys/file.h>

-#include <sys/time.h>
-#include <stdio.h>
-#include <setjmp.h>
-#include <paths.h>
-
-#ifndef NFS
-#include <sys/fs.h>
-#include <sys/inode.h>

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

-#else
+#include <sys/time.h>

 #include <sys/vnode.h>
 #include <ufs/fs.h>
 #include <ufs/inode.h>
 #include <sys/vnode.h>
 #include <ufs/fs.h>
 #include <ufs/inode.h>

-#include <ufs/fsdir.h>
-#endif /*NFS */
+#include <stdio.h>
+#include <setjmp.h>
+#include <paths.h>

 
 /*
  * Defines from the 4.3-tahoe file system, for systems with the 4.2 or 4.3
 
 /*
  * Defines from the 4.3-tahoe file system, for systems with the 4.2 or 4.3

diff --git a/usr/src/sbin/icheck/icheck.c b/usr/src/sbin/icheck/icheck.c
index 351d522..50432ef 100644 (file)
--- a/usr/src/sbin/icheck/icheck.c
+++ b/usr/src/sbin/icheck/icheck.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)icheck.c   5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)icheck.c   5.5 (Berkeley) %G%";

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


@@ -15,12 +15,14 @@ static char sccsid[] = "@(#)icheck.c        5.4 (Berkeley) %G%";
 #define        MAXFN   500
 #define        MAXNINDIR       (MAXBSIZE / sizeof (daddr_t))
 
 #define        MAXFN   500
 #define        MAXNINDIR       (MAXBSIZE / sizeof (daddr_t))
 

+#include <sys/param.h>
+#include <sys/time.h>
+#include <sys/vnode.h>
+#include <ufs/inode.h>
+#include <ufs/fs.h>

 #ifndef STANDALONE
 #include <stdio.h>
 #endif
 #ifndef STANDALONE
 #include <stdio.h>
 #endif

-#include <sys/param.h>
-#include <sys/inode.h>
-#include <sys/fs.h>

 
 union {
        struct  fs sb;
 
 union {
        struct  fs sb;

diff --git a/usr/src/sbin/ncheck/ncheck.c b/usr/src/sbin/ncheck/ncheck.c
index 13f4d01..f3482b3 100644 (file)
--- a/usr/src/sbin/ncheck/ncheck.c
+++ b/usr/src/sbin/ncheck/ncheck.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

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

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


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

-#include <sys/inode.h>
-#include <sys/fs.h>
+#include <sys/time.h
+#include <sys/vnode.h>
+#include <ufs/inode.h>
+#include <ufs/fs.h>

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

diff --git a/usr/src/sbin/quotacheck/quotacheck.c b/usr/src/sbin/quotacheck/quotacheck.c
index f3d90aa..92bd7ce 100644 (file)
--- a/usr/src/sbin/quotacheck/quotacheck.c
+++ b/usr/src/sbin/quotacheck/quotacheck.c
@@ -22,24 +22,26 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

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

 #endif /* not lint */
 
 /*
  * Fix up / report on disc quotas & usage
  */
 #endif /* not lint */
 
 /*
  * Fix up / report on disc quotas & usage
  */

-#include <stdio.h>
-#include <ctype.h>
-#include <signal.h>
-#include <errno.h>

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

-#include <sys/inode.h>
-#include <sys/fs.h>
-#include <sys/quota.h>
+#include <sys/time.h>
+#include <sys/vnode.h>
+#include <sys/signal.h>

 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/wait.h>

+#include <ufs/inode.h>
+#include <ufs/fs.h>
+#include <ufs/quota.h>

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

+#include <stdio.h>
+#include <ctype.h>
+#include <errno.h>

 
 union {
        struct  fs      sblk;
 
 union {
        struct  fs      sblk;