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

12 files changed, 12 insertions, 2 deletions

diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index daec257cf2e8..76ae8153bc98 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -57,6 +57,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
diff --git a/sys/pc98/cbus/olpt.c b/sys/pc98/cbus/olpt.c
index 542b7335635b..defa012d8e8c 100644
--- a/sys/pc98/cbus/olpt.c
+++ b/sys/pc98/cbus/olpt.c
@@ -111,6 +111,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
+#include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/kernel.h>
 #include <sys/uio.h>
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c
index 2193f46f58e3..5c45f8732107 100644
--- a/sys/pc98/i386/machdep.c
+++ b/sys/pc98/i386/machdep.c
@@ -62,6 +62,7 @@
 #include <sys/linker.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
+#include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/callout.h>
diff --git a/sys/pc98/pc98/diskslice_machdep.c b/sys/pc98/pc98/diskslice_machdep.c
index 5ff899caa1a2..2f9dec67e18f 100644
--- a/sys/pc98/pc98/diskslice_machdep.c
+++ b/sys/pc98/pc98/diskslice_machdep.c
@@ -46,6 +46,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/disklabel.h>
diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c
index daec257cf2e8..76ae8153bc98 100644
--- a/sys/pc98/pc98/fd.c
+++ b/sys/pc98/pc98/fd.c
@@ -57,6 +57,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index 2193f46f58e3..5c45f8732107 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -62,6 +62,7 @@
 #include <sys/linker.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
+#include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/callout.h>
diff --git a/sys/pc98/pc98/olpt.c b/sys/pc98/pc98/olpt.c
index 542b7335635b..defa012d8e8c 100644
--- a/sys/pc98/pc98/olpt.c
+++ b/sys/pc98/pc98/olpt.c
@@ -111,6 +111,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
+#include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/kernel.h>
 #include <sys/uio.h>
diff --git a/sys/pc98/pc98/spkr.c b/sys/pc98/pc98/spkr.c
index 6ac7c2fc4a31..4ec23a330e0a 100644
--- a/sys/pc98/pc98/spkr.c
+++ b/sys/pc98/pc98/spkr.c
@@ -14,6 +14,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/uio.h>
 #include <sys/conf.h>
diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c
index fc8728f78161..8ffd92061cb9 100644
--- a/sys/pc98/pc98/wd.c
+++ b/sys/pc98/pc98/wd.c
@@ -71,7 +71,7 @@
 #include <sys/bus.h>
 #include <sys/disklabel.h>
 #include <sys/diskslice.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
 #include <sys/devicestat.h>
 #include <sys/malloc.h>
 #include <machine/bootinfo.h>
diff --git a/sys/pc98/pc98/wd_cd.c b/sys/pc98/pc98/wd_cd.c
index 2980ae140291..722dc507678c 100644
--- a/sys/pc98/pc98/wd_cd.c
+++ b/sys/pc98/pc98/wd_cd.c
@@ -33,7 +33,7 @@
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
 #include <sys/disklabel.h>
 #include <sys/devicestat.h>
 #include <sys/cdio.h>
diff --git a/sys/pc98/pc98/wfd.c b/sys/pc98/pc98/wfd.c
index 458fffb9053d..439769f7e6d6 100644
--- a/sys/pc98/pc98/wfd.c
+++ b/sys/pc98/pc98/wfd.c
@@ -38,6 +38,7 @@
 #include <sys/conf.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
+#include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/devicestat.h>
 #include <sys/disklabel.h>
diff --git a/sys/pc98/pc98/wst.c b/sys/pc98/pc98/wst.c
index 412a56b17708..3e34a38cc8d9 100644
--- a/sys/pc98/pc98/wst.c
+++ b/sys/pc98/pc98/wst.c
@@ -36,6 +36,7 @@
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/malloc.h>
+#include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/mtio.h>
 #include <machine/clock.h>