diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2003-04-01 15:06:26 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2003-04-01 15:06:26 +0000 |
| commit | 891619a66d5e01e5d5db6a11cfd7f26c815338e3 (patch) | |
| tree | f08dda1f60d395e9bc94bf2fd1921768bf958c6d /sys/dev/amr | |
| parent | 29f3f095a624492078f7578be83d684fc32fb2a9 (diff) | |
| download | src-891619a66d5e01e5d5db6a11cfd7f26c815338e3.tar.gz src-891619a66d5e01e5d5db6a11cfd7f26c815338e3.zip | |
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.
Notes
Notes:
svn path=/head/; revision=112946
Diffstat (limited to 'sys/dev/amr')
| -rw-r--r-- | sys/dev/amr/amr.c | 1 | ||||
| -rw-r--r-- | sys/dev/amr/amr_cam.c | 1 | ||||
| -rw-r--r-- | sys/dev/amr/amr_disk.c | 1 | ||||
| -rw-r--r-- | sys/dev/amr/amr_pci.c | 1 | ||||
| -rw-r--r-- | sys/dev/amr/amrvar.h | 1 |
5 files changed, 1 insertions, 4 deletions
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c index 170ff988c552..29e0a301d8f8 100644 --- a/sys/dev/amr/amr.c +++ b/sys/dev/amr/amr.c @@ -68,7 +68,6 @@ #include <dev/amr/amr_compat.h> #include <sys/bus.h> #include <sys/conf.h> -#include <sys/disk.h> #include <sys/stat.h> #include <machine/bus_memio.h> diff --git a/sys/dev/amr/amr_cam.c b/sys/dev/amr/amr_cam.c index 1c8f6b6a74db..d30c9647116a 100644 --- a/sys/dev/amr/amr_cam.c +++ b/sys/dev/amr/amr_cam.c @@ -64,7 +64,6 @@ #include <dev/amr/amr_compat.h> #include <sys/bus.h> #include <sys/conf.h> -#include <sys/disk.h> #include <sys/stat.h> #include <cam/cam.h> diff --git a/sys/dev/amr/amr_disk.c b/sys/dev/amr/amr_disk.c index 4266f15554c6..e7a9bbe56e7a 100644 --- a/sys/dev/amr/amr_disk.c +++ b/sys/dev/amr/amr_disk.c @@ -68,7 +68,6 @@ #include <dev/amr/amr_compat.h> #include <sys/bus.h> #include <sys/conf.h> -#include <sys/disk.h> #include <machine/bus.h> #include <sys/rman.h> diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c index caffc5dd0aaf..eacb1bd41f19 100644 --- a/sys/dev/amr/amr_pci.c +++ b/sys/dev/amr/amr_pci.c @@ -63,7 +63,6 @@ #include <dev/amr/amr_compat.h> #include <sys/bus.h> #include <sys/conf.h> -#include <sys/disk.h> #include <machine/bus_memio.h> #include <machine/bus_pio.h> diff --git a/sys/dev/amr/amrvar.h b/sys/dev/amr/amrvar.h index a9bca40588b7..a28fa473b021 100644 --- a/sys/dev/amr/amrvar.h +++ b/sys/dev/amr/amrvar.h @@ -58,6 +58,7 @@ #if __FreeBSD_version >= 500005 # include <sys/taskqueue.h> +# include <geom/geom_disk.h> #endif #ifdef AMR_DEBUG |