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/mlx | |
| 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/mlx')
| -rw-r--r-- | sys/dev/mlx/mlx.c | 3 | ||||
| -rw-r--r-- | sys/dev/mlx/mlx_disk.c | 3 | ||||
| -rw-r--r-- | sys/dev/mlx/mlx_pci.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c index d8841de..b68dd71 100644 --- a/sys/dev/mlx/mlx.c +++ b/sys/dev/mlx/mlx.c @@ -37,7 +37,6 @@ #include <sys/bus.h> #include <sys/conf.h> -#include <sys/disk.h> #include <sys/stat.h> #include <machine/resource.h> @@ -47,6 +46,8 @@ #include <machine/clock.h> #include <sys/rman.h> +#include <geom/geom_disk.h> + #include <dev/mlx/mlx_compat.h> #include <dev/mlx/mlxio.h> #include <dev/mlx/mlxvar.h> diff --git a/sys/dev/mlx/mlx_disk.c b/sys/dev/mlx/mlx_disk.c index 0b8664f..44c5965 100644 --- a/sys/dev/mlx/mlx_disk.c +++ b/sys/dev/mlx/mlx_disk.c @@ -37,11 +37,12 @@ #include <sys/bus.h> #include <sys/conf.h> -#include <sys/disk.h> #include <machine/bus.h> #include <sys/rman.h> +#include <geom/geom_disk.h> + #include <dev/mlx/mlx_compat.h> #include <dev/mlx/mlxio.h> #include <dev/mlx/mlxvar.h> diff --git a/sys/dev/mlx/mlx_pci.c b/sys/dev/mlx/mlx_pci.c index 4a21246..a2c1792 100644 --- a/sys/dev/mlx/mlx_pci.c +++ b/sys/dev/mlx/mlx_pci.c @@ -32,7 +32,6 @@ #include <sys/bus.h> #include <sys/conf.h> -#include <sys/disk.h> #include <machine/bus_memio.h> #include <machine/bus_pio.h> @@ -40,6 +39,8 @@ #include <machine/resource.h> #include <sys/rman.h> +#include <geom/geom_disk.h> + #include <pci/pcireg.h> #include <pci/pcivar.h> |
