remove the last of the MI commons

3 files changed, 15 insertions, 13 deletions

diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c
index c6fd8778450..09ab874665b 100644
--- a/sys/netinet/tcp_debug.c
+++ b/sys/netinet/tcp_debug.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_debug.c,v 1.13 2003/03/30 22:23:34 tedu Exp $	*/
+/*	$OpenBSD: tcp_debug.c,v 1.14 2003/05/14 01:12:27 jason Exp $	*/
 /*	$NetBSD: tcp_debug.c,v 1.10 1996/02/13 23:43:36 christos Exp $	*/
 
 /*
@@ -111,6 +111,10 @@
 #ifdef TCPDEBUG
 int	tcpconsdebug = 0;
 #endif
+
+struct	tcp_debug tcp_debug[TCP_NDEBUG];
+int	tcp_debx;
+
 /*
  * Tcp debug routines
  */
diff --git a/sys/netinet/tcp_debug.h b/sys/netinet/tcp_debug.h
index 042db3d4f44..9f9c2c2610f 100644
--- a/sys/netinet/tcp_debug.h
+++ b/sys/netinet/tcp_debug.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_debug.h,v 1.5 2001/06/09 07:03:43 angelos Exp $	*/
+/*	$OpenBSD: tcp_debug.h,v 1.6 2003/05/14 01:12:27 jason Exp $	*/
 /*	$NetBSD: tcp_debug.h,v 1.5 1994/06/29 06:38:38 cgd Exp $	*/
 
 /*
@@ -64,6 +64,6 @@ char	*tanames[] =
 #endif /* TANAMES */
 
 #define	TCP_NDEBUG 100
-struct	tcp_debug tcp_debug[TCP_NDEBUG];
-int	tcp_debx;
+extern struct	tcp_debug tcp_debug[];
+extern int	tcp_debx;
 #endif /* _NETINET_TCP_DEBUG_H_ */
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 65e05e72711..03532af425d 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_softdep.c,v 1.42 2002/10/12 01:09:45 krw Exp $	*/
+/*	$OpenBSD: ffs_softdep.c,v 1.43 2003/05/14 01:12:27 jason Exp $	*/
 /*
  * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved.
  *
@@ -171,14 +171,6 @@ void softdep_deallocate_dependencies(struct buf *);
 void softdep_move_dependencies(struct buf *, struct buf *);
 int softdep_count_dependencies(struct buf *bp, int, int);
 
-struct bio_ops bioops = {
-	softdep_disk_io_initiation,		/* io_start */
-	softdep_disk_write_complete,		/* io_complete */
-	softdep_deallocate_dependencies,	/* io_deallocate */
-	softdep_move_dependencies,		/* io_movedeps */
-	softdep_count_dependencies,		/* io_countdeps */
-};
-
 /*
  * Locking primitives.
  *
@@ -1157,6 +1149,12 @@ void
 softdep_initialize()
 {
 
+	bioops.io_start = softdep_disk_io_initiation;
+	bioops.io_complete = softdep_disk_write_complete;
+	bioops.io_deallocate = softdep_deallocate_dependencies;
+	bioops.io_movedeps = softdep_move_dependencies;
+	bioops.io_countdeps = softdep_count_dependencies;
+
 	LIST_INIT(&mkdirlisthd);
 	LIST_INIT(&softdep_workitem_pending);
 #ifdef KMEMSTATS