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.

1 files changed, 2 insertions, 2 deletions

diff --git a/sys/dev/pst/pst-raid.c b/sys/dev/pst/pst-raid.c
index 9e02aac..cb6be12 100644
--- a/sys/dev/pst/pst-raid.c
+++ b/sys/dev/pst/pst-raid.c
@@ -35,7 +35,6 @@
 #include <sys/bus.h>
 #include <sys/bio.h>
 #include <sys/conf.h>
-#include <sys/disk.h>
 #include <sys/eventhandler.h>
 #include <sys/malloc.h>
 #include <sys/lock.h>
@@ -48,6 +47,7 @@
 #include <sys/rman.h>
 #include <pci/pcivar.h>
 #include <pci/pcireg.h>
+#include <geom/geom_disk.h>
 
 #include "dev/pst/pst-iop.h"
 
@@ -200,7 +200,7 @@ pststrategy(struct bio *bp)
     struct pst_softc *psc = bp->bio_disk->d_drv1;
     
     mtx_lock(&psc->mtx);
-    bioqdisksort(&psc->queue, bp);
+    bioq_disksort(&psc->queue, bp);
     pst_start(psc);
     mtx_unlock(&psc->mtx);
 }