Separate the struct bio related stuff out of <sys/buf.h> into

<sys/bio.h>.

<sys/bio.h> is now a prerequisite for <sys/buf.h> but it shall
not be made a nested include according to bdes teachings on the
subject of nested includes.

Diskdrivers and similar stuff below specfs::strategy() should no
longer need to include <sys/buf.> unless they need caching of data.

Still a few bogus uses of struct buf to track down.

Repocopy by:    peter

7 files changed, 8 insertions, 6 deletions

diff --git a/sys/i386/isa/bs/bsif.h b/sys/i386/isa/bs/bsif.h
index 4311894..5a89681 100644
--- a/sys/i386/isa/bs/bsif.h
+++ b/sys/i386/isa/bs/bsif.h
@@ -75,7 +75,7 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/disklabel.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
 #include <sys/queue.h>
 #include <sys/malloc.h>
 #include <sys/errno.h>
diff --git a/sys/i386/isa/labpc.c b/sys/i386/isa/labpc.c
index ba59bc8..c3c06b7 100644
--- a/sys/i386/isa/labpc.c
+++ b/sys/i386/isa/labpc.c
@@ -50,7 +50,7 @@
 
 #include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
 #define b_actf	bio_queue.tqe_next
 #include <sys/dataacq.h>
 #include <sys/conf.h>
diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c
index 4b48446..b056a84 100644
--- a/sys/i386/isa/matcd/matcd.c
+++ b/sys/i386/isa/matcd/matcd.c
@@ -348,7 +348,7 @@ static char	MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank
 #include	<sys/param.h>
 #include	<sys/systm.h>
 
-#include	<sys/buf.h>
+#include <sys/bio.h>
 #include	<sys/cdio.h>
 #include	<sys/disklabel.h>
 #include	<sys/fcntl.h>
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index 1bdc726..aeb5e4c 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -49,7 +49,7 @@ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
 #include <sys/cdio.h>
 #include <sys/disklabel.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index d0ae35e..7c83434 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/scd.c
@@ -51,7 +51,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
 #include <sys/cdio.h>
 #include <sys/disklabel.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/isa/sound/os.h b/sys/i386/isa/sound/os.h
index 1abc45b..fb94008 100644
--- a/sys/i386/isa/sound/os.h
+++ b/sys/i386/isa/sound/os.h
@@ -1,6 +1,7 @@
 /*
  * os.h -- only included by sound_config.h right after local.h
  *
+ * $FreeBSD$
  */
 
 #ifndef _OS_H_
@@ -16,6 +17,7 @@
 #include <sys/kernel.h>
 #include <sys/poll.h>
 #include <sys/malloc.h>
+#include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/signalvar.h>
 
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index f6e65a5..c6b46e4 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -62,7 +62,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
 #include <sys/fcntl.h>
 #include <sys/malloc.h>
 #include <sys/mtio.h>