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.

5 files changed, 1 insertions, 4 deletions

diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index 170ff98..29e0a30 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 1c8f6b6..d30c964 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 4266f15..e7a9bbe 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 caffc5d..eacb1bd 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 a9bca40..a28fa47 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