diff options
| author | phk <phk@FreeBSD.org> | 2004-10-29 11:12:16 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-10-29 11:12:16 +0000 |
| commit | 5637a20bbe42fe61852e15dd0dd33674f676b1e5 (patch) | |
| tree | 52a1e0877c4471f60a70abfafcacf46debdd4d61 /sys/pc98 | |
| parent | 6358ee90d6bd518ae632aaae71a924f4041051f1 (diff) | |
| download | FreeBSD-src-5637a20bbe42fe61852e15dd0dd33674f676b1e5.zip FreeBSD-src-5637a20bbe42fe61852e15dd0dd33674f676b1e5.tar.gz | |
Don't set si_bsize_phys.
Use bioq_takefirst()
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/pc98/wd_cd.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/pc98/pc98/wd_cd.c b/sys/pc98/pc98/wd_cd.c index 5ac001e..dbf3599 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); |
