summaryrefslogtreecommitdiff
path: root/sys/pc98
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>2004-10-29 11:12:16 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>2004-10-29 11:12:16 +0000
commit7229625e6d399971bdad6a206a6fa2f6cb798b54 (patch)
tree52a1e0877c4471f60a70abfafcacf46debdd4d61 /sys/pc98
parent55f499a94f291f1c0957585d32e6b43521fd59e4 (diff)
Notes
Diffstat (limited to 'sys/pc98')
-rw-r--r--sys/pc98/pc98/wd_cd.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/pc98/pc98/wd_cd.c b/sys/pc98/pc98/wd_cd.c
index 5ac001ea018d..dbf359940456 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);