diff options
| author | phk <phk@FreeBSD.org> | 2003-04-01 15:06:26 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-04-01 15:06:26 +0000 |
| commit | c235e25328c6cf4b9091f38d9c18db15764df594 (patch) | |
| tree | f08dda1f60d395e9bc94bf2fd1921768bf958c6d /sys/dev/ida | |
| parent | 98acc8a3d79206dbf51e83ae8573fa89e54645b6 (diff) | |
| download | FreeBSD-src-c235e25328c6cf4b9091f38d9c18db15764df594.zip FreeBSD-src-c235e25328c6cf4b9091f38d9c18db15764df594.tar.gz | |
Use bioq_flush() to drain a bio queue with a specific error code.
Retain the mistake of not updating the devstat API for now.
Spell bioq_disksort() consistently with the remaining bioq_*().
#include <geom/geom_disk.h> where this is more appropriate.
Diffstat (limited to 'sys/dev/ida')
| -rw-r--r-- | sys/dev/ida/ida.c | 3 | ||||
| -rw-r--r-- | sys/dev/ida/ida_disk.c | 3 | ||||
| -rw-r--r-- | sys/dev/ida/ida_eisa.c | 3 | ||||
| -rw-r--r-- | sys/dev/ida/ida_pci.c | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/sys/dev/ida/ida.c b/sys/dev/ida/ida.c index 5cb69a4..c141749 100644 --- a/sys/dev/ida/ida.c +++ b/sys/dev/ida/ida.c @@ -46,13 +46,14 @@ #include <sys/bio.h> #include <sys/bus.h> #include <sys/conf.h> -#include <sys/disk.h> #include <machine/bus_memio.h> #include <machine/bus_pio.h> #include <machine/bus.h> #include <sys/rman.h> +#include <geom/geom_disk.h> + #include <dev/ida/idareg.h> #include <dev/ida/idavar.h> diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c index 7efb8de..bc82980 100644 --- a/sys/dev/ida/ida_disk.c +++ b/sys/dev/ida/ida_disk.c @@ -38,7 +38,6 @@ #include <sys/bus.h> #include <sys/conf.h> #include <sys/cons.h> -#include <sys/disk.h> #include <machine/bus_memio.h> #include <machine/bus_pio.h> @@ -49,6 +48,8 @@ #include <vm/pmap.h> #include <machine/md_var.h> +#include <geom/geom_disk.h> + #include <dev/ida/idareg.h> #include <dev/ida/idavar.h> diff --git a/sys/dev/ida/ida_eisa.c b/sys/dev/ida/ida_eisa.c index eca4722..a6f3419 100644 --- a/sys/dev/ida/ida_eisa.c +++ b/sys/dev/ida/ida_eisa.c @@ -34,13 +34,14 @@ #include <sys/bio.h> #include <sys/conf.h> -#include <sys/disk.h> #include <machine/bus_pio.h> #include <machine/bus.h> #include <machine/resource.h> #include <sys/rman.h> +#include <geom/geom_disk.h> + #include <dev/ida/idavar.h> #include <dev/ida/idareg.h> diff --git a/sys/dev/ida/ida_pci.c b/sys/dev/ida/ida_pci.c index f7194a4..c836de0 100644 --- a/sys/dev/ida/ida_pci.c +++ b/sys/dev/ida/ida_pci.c @@ -33,7 +33,6 @@ #include <sys/bio.h> #include <sys/bus.h> #include <sys/conf.h> -#include <sys/disk.h> #include <machine/bus_memio.h> #include <machine/bus_pio.h> @@ -44,6 +43,8 @@ #include <pci/pcireg.h> #include <pci/pcivar.h> +#include <geom/geom_disk.h> + #include <dev/ida/idavar.h> #include <dev/ida/idareg.h> |
