summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>2000-05-05 09:59:14 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>2000-05-05 09:59:14 +0000
commit9626b608de4a43ec9984c3ee95b2ce624b3c0924 (patch)
treeb1e53d453112b9bf26ef95be27ea84f2e9bdacf0 /sys/dev
parent33a0a551d439227028f2280faebe76b81c857cca (diff)
Notes
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/amr/amr.c2
-rw-r--r--sys/dev/amr/amr_disk.c2
-rw-r--r--sys/dev/amr/amr_pci.c2
-rw-r--r--sys/dev/ata/ata-all.c2
-rw-r--r--sys/dev/ata/ata-disk.c2
-rw-r--r--sys/dev/ata/ata-dma.c2
-rw-r--r--sys/dev/ata/atapi-cd.c2
-rw-r--r--sys/dev/ata/atapi-fd.c2
-rw-r--r--sys/dev/ata/atapi-tape.c2
-rw-r--r--sys/dev/ccd/ccd.c2
-rw-r--r--sys/dev/dpt/dpt_control.c1
-rw-r--r--sys/dev/fdc/fdc.c1
-rw-r--r--sys/dev/ida/ida.c2
-rw-r--r--sys/dev/ida/ida_disk.c2
-rw-r--r--sys/dev/ida/ida_eisa.c2
-rw-r--r--sys/dev/ida/ida_pci.c2
-rw-r--r--sys/dev/mcd/mcd.c2
-rw-r--r--sys/dev/md/md.c2
-rw-r--r--sys/dev/mlx/mlx.c2
-rw-r--r--sys/dev/mlx/mlx_disk.c2
-rw-r--r--sys/dev/mlx/mlx_pci.c2
-rw-r--r--sys/dev/scd/scd.c2
-rw-r--r--sys/dev/sound/pcm/sound.h1
-rw-r--r--sys/dev/usb/usb_mem.h1
-rw-r--r--sys/dev/vinum/vinumhdr.h1
-rw-r--r--sys/dev/vn/vn.c8
26 files changed, 28 insertions, 25 deletions
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index b81403e5998f..380ea3693a50 100644
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.c
@@ -35,7 +35,7 @@
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
#include <sys/bus.h>
#include <sys/conf.h>
#include <sys/devicestat.h>
diff --git a/sys/dev/amr/amr_disk.c b/sys/dev/amr/amr_disk.c
index 9d6be1d15c4c..1e5082ad22c8 100644
--- a/sys/dev/amr/amr_disk.c
+++ b/sys/dev/amr/amr_disk.c
@@ -35,7 +35,7 @@
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
#include <sys/bus.h>
#include <sys/conf.h>
#include <sys/devicestat.h>
diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c
index a144fcc96078..fc9f8a9ea2d4 100644
--- a/sys/dev/amr/amr_pci.c
+++ b/sys/dev/amr/amr_pci.c
@@ -31,7 +31,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
#include <sys/conf.h>
#include <sys/devicestat.h>
#include <sys/disk.h>
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index 17fa2efa36e6..41e802fa170b 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -44,7 +44,7 @@
#include <sys/disk.h>
#include <sys/module.h>
#include <sys/bus.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
#include <sys/malloc.h>
#include <sys/devicestat.h>
#include <sys/sysctl.h>
diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c
index 2f0460fbff53..627366c1d371 100644
--- a/sys/dev/ata/ata-disk.c
+++ b/sys/dev/ata/ata-disk.c
@@ -36,7 +36,7 @@
#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/malloc.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
#include <sys/bus.h>
#include <sys/conf.h>
#include <sys/disk.h>
diff --git a/sys/dev/ata/ata-dma.c b/sys/dev/ata/ata-dma.c
index dc96bde13a11..cd586ca4650d 100644
--- a/sys/dev/ata/ata-dma.c
+++ b/sys/dev/ata/ata-dma.c
@@ -31,7 +31,7 @@
#include "pci.h"
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
#include <sys/malloc.h>
#include <sys/bus.h>
#include <sys/disk.h>
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index 65b2ae50e0b3..9cd87d200687 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-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/bus.h>
#include <sys/disklabel.h>
#include <sys/devicestat.h>
diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c
index b1e2051fd315..abeac0235770 100644
--- a/sys/dev/ata/atapi-fd.c
+++ b/sys/dev/ata/atapi-fd.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/bus.h>
#include <sys/conf.h>
#include <sys/disk.h>
diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c
index 092891f282b4..aaa2be70b596 100644
--- a/sys/dev/ata/atapi-tape.c
+++ b/sys/dev/ata/atapi-tape.c
@@ -33,7 +33,7 @@
#include <sys/kernel.h>
#include <sys/conf.h>
#include <sys/malloc.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
#include <sys/bus.h>
#include <sys/mtio.h>
#include <sys/disklabel.h>
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index ad301ab266e7..3f62c1ad5138 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -94,7 +94,7 @@
#include <sys/kernel.h>
#include <sys/module.h>
#include <sys/proc.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
#include <sys/malloc.h>
#include <sys/namei.h>
#include <sys/conf.h>
diff --git a/sys/dev/dpt/dpt_control.c b/sys/dev/dpt/dpt_control.c
index 474eb8838b04..ef3ddf265049 100644
--- a/sys/dev/dpt/dpt_control.c
+++ b/sys/dev/dpt/dpt_control.c
@@ -45,6 +45,7 @@
#include <sys/systm.h>
#include <sys/malloc.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/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index cd4df134945b..f3d47b47c29a 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/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/dev/ida/ida.c b/sys/dev/ida/ida.c
index e76c56a63c52..d10986c813d0 100644
--- a/sys/dev/ida/ida.c
+++ b/sys/dev/ida/ida.c
@@ -44,7 +44,7 @@
#include <sys/systm.h>
#include <sys/malloc.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
#include <sys/bus.h>
#include <sys/devicestat.h>
#include <sys/disk.h>
diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c
index 72a6f04055a2..47e32a9191e8 100644
--- a/sys/dev/ida/ida_disk.c
+++ b/sys/dev/ida/ida_disk.c
@@ -34,7 +34,7 @@
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
#include <sys/bus.h>
#include <sys/conf.h>
#include <sys/devicestat.h>
diff --git a/sys/dev/ida/ida_eisa.c b/sys/dev/ida/ida_eisa.c
index fd3fd29e2015..93b8bdf5e3fb 100644
--- a/sys/dev/ida/ida_eisa.c
+++ b/sys/dev/ida/ida_eisa.c
@@ -32,7 +32,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
#include <sys/devicestat.h>
#include <sys/disk.h>
diff --git a/sys/dev/ida/ida_pci.c b/sys/dev/ida/ida_pci.c
index 0bb7e9fa80ad..04cf5c7f75f0 100644
--- a/sys/dev/ida/ida_pci.c
+++ b/sys/dev/ida/ida_pci.c
@@ -30,7 +30,7 @@
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
#include <sys/bus.h>
#include <sys/devicestat.h>
#include <sys/disk.h>
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 1bdc7263aca6..aeb5e4cb3ee3 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/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/dev/md/md.c b/sys/dev/md/md.c
index 44a7cef4b7f0..3543a068bec9 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -15,7 +15,7 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
#include <sys/conf.h>
#include <sys/devicestat.h>
#include <sys/disk.h>
diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c
index cc226e8891f8..942bebbe1cb5 100644
--- a/sys/dev/mlx/mlx.c
+++ b/sys/dev/mlx/mlx.c
@@ -35,7 +35,7 @@
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
#include <sys/bus.h>
#include <sys/conf.h>
#include <sys/devicestat.h>
diff --git a/sys/dev/mlx/mlx_disk.c b/sys/dev/mlx/mlx_disk.c
index 15af6b7481fe..190f7a785468 100644
--- a/sys/dev/mlx/mlx_disk.c
+++ b/sys/dev/mlx/mlx_disk.c
@@ -35,7 +35,7 @@
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
#include <sys/bus.h>
#include <sys/conf.h>
#include <sys/devicestat.h>
diff --git a/sys/dev/mlx/mlx_pci.c b/sys/dev/mlx/mlx_pci.c
index 6fe9a562126a..9a5a658cc4e7 100644
--- a/sys/dev/mlx/mlx_pci.c
+++ b/sys/dev/mlx/mlx_pci.c
@@ -31,7 +31,7 @@
#include <sys/kernel.h>
#include <sys/bus.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
#include <sys/conf.h>
#include <sys/devicestat.h>
#include <sys/disk.h>
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index d0ae35ed873a..7c8343409004 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/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/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
index e4565974084b..9520c29b7397 100644
--- a/sys/dev/sound/pcm/sound.h
+++ b/sys/dev/sound/pcm/sound.h
@@ -55,6 +55,7 @@
#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/bus.h>
+#include <sys/bio.h>
#include <sys/buf.h>
#include <machine/clock.h> /* for DELAY */
#include <machine/resource.h>
diff --git a/sys/dev/usb/usb_mem.h b/sys/dev/usb/usb_mem.h
index ac19b84240f1..35f08532f3a9 100644
--- a/sys/dev/usb/usb_mem.h
+++ b/sys/dev/usb/usb_mem.h
@@ -68,6 +68,7 @@ void usb_freemem __P((usbd_bus_handle, usb_dma_t *));
#include <sys/systm.h>
#include <sys/queue.h>
#include <sys/proc.h>
+#include <sys/bio.h>
#include <sys/buf.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
diff --git a/sys/dev/vinum/vinumhdr.h b/sys/dev/vinum/vinumhdr.h
index 9fa4f58cc1b3..2f46ddfe71dd 100644
--- a/sys/dev/vinum/vinumhdr.h
+++ b/sys/dev/vinum/vinumhdr.h
@@ -49,6 +49,7 @@
#include <sys/proc.h>
#include <sys/errno.h>
#include <sys/dkstat.h>
+#include <sys/bio.h>
#include <sys/buf.h>
#include <sys/malloc.h>
#include <sys/uio.h>
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index f8ba7e9912b4..b59e317a338d 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -65,7 +65,7 @@
#include <sys/kernel.h>
#include <sys/namei.h>
#include <sys/proc.h>
-#include <sys/buf.h>
+#include <sys/bio.h>
#include <sys/malloc.h>
#include <sys/mount.h>
#include <sys/vnode.h>
@@ -136,7 +136,6 @@ struct vn_softc {
vm_object_t sc_object; /* backing object if not NULL */
struct ucred *sc_cred; /* credentials */
int sc_maxactive; /* max # of active requests */
- struct buf sc_tab; /* transfer queue */
u_long sc_options; /* options */
SLIST_ENTRY(vn_softc) sc_list;
};
@@ -300,8 +299,8 @@ vnstrategy(struct bio *bp)
IFOPT(vn, VN_LABELS) {
if (vn->sc_slices != NULL && dscheck(bp, vn->sc_slices) <= 0) {
- /* XXX: Normal B_ERROR processing, instead ? */
- bp->bio_flags |= B_INVAL;
+ bp->bio_error = EINVAL;
+ bp->bio_flags |= BIO_ERROR;
biodone(bp);
return;
}
@@ -316,7 +315,6 @@ vnstrategy(struct bio *bp)
if (bp->bio_bcount % vn->sc_secsize != 0 ||
bp->bio_blkno % (vn->sc_secsize / DEV_BSIZE) != 0) {
bp->bio_error = EINVAL;
- /* XXX bp->b_flags |= B_INVAL; */
bp->bio_flags |= BIO_ERROR;
biodone(bp);
return;
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-08 15:09:31 +0000