From 7229625e6d399971bdad6a206a6fa2f6cb798b54 Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Fri, 29 Oct 2004 11:12:16 +0000
Subject: [PATCH] Don't set si_bsize_phys.

Use bioq_takefirst()
---
 sys/pc98/pc98/wd_cd.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sys/pc98/pc98/wd_cd.c b/sys/pc98/pc98/wd_cd.c
index 5ac001ea018..dbf35994045 100644
--- a/sys/pc98/pc98/wd_cd.c
+++ b/sys/pc98/pc98/wd_cd.c
@@ -378,7 +378,6 @@ acdopen(struct cdev *dev, int flags, int fmt, struct thread *td)
         cdp->flags |= F_BOPEN;
     else
         ++cdp->refcnt;
-    dev->si_bsize_phys = cdp->block_size;
     if (!(flags & O_NONBLOCK) && acd_read_toc(cdp) && !(flags & FWRITE))
         printf("acd%d: read_toc failed\n", cdp->unit);
     return 0;
@@ -442,7 +441,7 @@ acdstrategy(struct bio *bp)
 static void 
 acd_start(struct acd *cdp)
 {
-    struct bio *bp = bioq_first(&cdp->bio_queue);
+    struct bio *bp = bioq_takefirst(&cdp->bio_queue);
     u_long lba, blocks;
     int cmd;
     int count;
@@ -450,8 +449,6 @@ acd_start(struct acd *cdp)
     if (!bp)
         return;
 
-    bioq_remove(&cdp->bio_queue, bp);
-
     /* Should reject all queued entries if media have changed. */
     if (cdp->flags & F_MEDIA_CHANGED) {
         biofinish(bp, NULL, EIO);