Back out DIAGNOSTIC changes.

15 files changed, 3 insertions, 27 deletions

diff --git a/sys/gnu/ext2fs/ext2_alloc.c b/sys/gnu/ext2fs/ext2_alloc.c
index 541aa2d..cfd4ac9 100644
--- a/sys/gnu/ext2fs/ext2_alloc.c
+++ b/sys/gnu/ext2fs/ext2_alloc.c
@@ -39,7 +39,6 @@
  *	@(#)ext2_alloc.c	8.8 (Berkeley) 2/21/94
  */
 
-#include "opt_diagnostic.h"
 #include "opt_quota.h"
 
 #include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_balloc.c b/sys/gnu/ext2fs/ext2_balloc.c
index f7ea491..3d87123 100644
--- a/sys/gnu/ext2fs/ext2_balloc.c
+++ b/sys/gnu/ext2fs/ext2_balloc.c
@@ -39,8 +39,6 @@
  *	@(#)ffs_balloc.c	8.4 (Berkeley) 9/23/93
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
diff --git a/sys/gnu/ext2fs/ext2_bmap.c b/sys/gnu/ext2fs/ext2_bmap.c
index b4af4bf..6b7d289 100644
--- a/sys/gnu/ext2fs/ext2_bmap.c
+++ b/sys/gnu/ext2fs/ext2_bmap.c
@@ -36,11 +36,9 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.7 (Berkeley) 3/21/95
- * $Id: ufs_bmap.c,v 1.18 1998/01/24 02:01:41 dyson Exp $
+ * $Id: ufs_bmap.c,v 1.19 1998/02/04 22:33:35 eivind Exp $
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
diff --git a/sys/gnu/ext2fs/ext2_ihash.c b/sys/gnu/ext2fs/ext2_ihash.c
index 8729f62..56be3fd 100644
--- a/sys/gnu/ext2fs/ext2_ihash.c
+++ b/sys/gnu/ext2fs/ext2_ihash.c
@@ -31,11 +31,9 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
- * $Id: ufs_ihash.c,v 1.13 1997/12/05 19:55:51 bde Exp $
+ * $Id: ufs_ihash.c,v 1.14 1998/02/04 22:33:35 eivind Exp $
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lock.h>
diff --git a/sys/gnu/ext2fs/ext2_inode.c b/sys/gnu/ext2fs/ext2_inode.c
index 07f81b0..5231fec 100644
--- a/sys/gnu/ext2fs/ext2_inode.c
+++ b/sys/gnu/ext2fs/ext2_inode.c
@@ -39,7 +39,6 @@
  *	@(#)ext2_inode.c	8.5 (Berkeley) 12/30/93
  */
 
-#include "opt_diagnostic.h"
 #include "opt_quota.h"
 
 #include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_lookup.c b/sys/gnu/ext2fs/ext2_lookup.c
index e4d9fef..dc70c76 100644
--- a/sys/gnu/ext2fs/ext2_lookup.c
+++ b/sys/gnu/ext2fs/ext2_lookup.c
@@ -44,8 +44,6 @@
  *	@(#)ufs_lookup.c	8.6 (Berkeley) 4/1/94
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
diff --git a/sys/gnu/ext2fs/ext2_subr.c b/sys/gnu/ext2fs/ext2_subr.c
index 462f727..a70e445 100644
--- a/sys/gnu/ext2fs/ext2_subr.c
+++ b/sys/gnu/ext2fs/ext2_subr.c
@@ -39,8 +39,6 @@
  *	@(#)ext2_subr.c	8.2 (Berkeley) 9/21/93
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <gnu/ext2fs/ext2_fs_sb.h>
 #include <gnu/ext2fs/fs.h>
diff --git a/sys/gnu/ext2fs/ext2_vnops.c b/sys/gnu/ext2fs/ext2_vnops.c
index 3c74684..91a89c9 100644
--- a/sys/gnu/ext2fs/ext2_vnops.c
+++ b/sys/gnu/ext2fs/ext2_vnops.c
@@ -45,7 +45,6 @@
  *	@(#)ext2_vnops.c	8.7 (Berkeley) 2/3/94
  */
 
-#include "opt_diagnostic.h"
 #include "opt_quota.h"
 #include "opt_suiddir.h"
 
diff --git a/sys/gnu/fs/ext2fs/ext2_alloc.c b/sys/gnu/fs/ext2fs/ext2_alloc.c
index 541aa2d..cfd4ac9 100644
--- a/sys/gnu/fs/ext2fs/ext2_alloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_alloc.c
@@ -39,7 +39,6 @@
  *	@(#)ext2_alloc.c	8.8 (Berkeley) 2/21/94
  */
 
-#include "opt_diagnostic.h"
 #include "opt_quota.h"
 
 #include <sys/param.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_balloc.c b/sys/gnu/fs/ext2fs/ext2_balloc.c
index f7ea491..3d87123 100644
--- a/sys/gnu/fs/ext2fs/ext2_balloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_balloc.c
@@ -39,8 +39,6 @@
  *	@(#)ffs_balloc.c	8.4 (Berkeley) 9/23/93
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c
index b4af4bf..6b7d289 100644
--- a/sys/gnu/fs/ext2fs/ext2_bmap.c
+++ b/sys/gnu/fs/ext2fs/ext2_bmap.c
@@ -36,11 +36,9 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.7 (Berkeley) 3/21/95
- * $Id: ufs_bmap.c,v 1.18 1998/01/24 02:01:41 dyson Exp $
+ * $Id: ufs_bmap.c,v 1.19 1998/02/04 22:33:35 eivind Exp $
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_inode.c b/sys/gnu/fs/ext2fs/ext2_inode.c
index 07f81b0..5231fec 100644
--- a/sys/gnu/fs/ext2fs/ext2_inode.c
+++ b/sys/gnu/fs/ext2fs/ext2_inode.c
@@ -39,7 +39,6 @@
  *	@(#)ext2_inode.c	8.5 (Berkeley) 12/30/93
  */
 
-#include "opt_diagnostic.h"
 #include "opt_quota.h"
 
 #include <sys/param.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_lookup.c b/sys/gnu/fs/ext2fs/ext2_lookup.c
index e4d9fef..dc70c76 100644
--- a/sys/gnu/fs/ext2fs/ext2_lookup.c
+++ b/sys/gnu/fs/ext2fs/ext2_lookup.c
@@ -44,8 +44,6 @@
  *	@(#)ufs_lookup.c	8.6 (Berkeley) 4/1/94
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_subr.c b/sys/gnu/fs/ext2fs/ext2_subr.c
index 462f727..a70e445 100644
--- a/sys/gnu/fs/ext2fs/ext2_subr.c
+++ b/sys/gnu/fs/ext2fs/ext2_subr.c
@@ -39,8 +39,6 @@
  *	@(#)ext2_subr.c	8.2 (Berkeley) 9/21/93
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <gnu/ext2fs/ext2_fs_sb.h>
 #include <gnu/ext2fs/fs.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_vnops.c b/sys/gnu/fs/ext2fs/ext2_vnops.c
index 3c74684..91a89c9 100644
--- a/sys/gnu/fs/ext2fs/ext2_vnops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vnops.c
@@ -45,7 +45,6 @@
  *	@(#)ext2_vnops.c	8.7 (Berkeley) 2/3/94
  */
 
-#include "opt_diagnostic.h"
 #include "opt_quota.h"
 #include "opt_suiddir.h"