From 313310b9a62adb46660eb348051e22f68aab5fbe Mon Sep 17 00:00:00 2001 From: phk Date: Sat, 18 Oct 2003 17:45:45 +0000 Subject: Discontinue bio_blkno usage. --- sys/pc98/pc98/wd.c | 2 +- sys/pc98/pc98/wd_cd.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'sys/pc98') diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c index 04bf0c3..93b39f2 100644 --- a/sys/pc98/pc98/wd.c +++ b/sys/pc98/pc98/wd.c @@ -618,7 +618,7 @@ wdstrategy(struct bio *bp) int s; du = bp->bio_disk->d_drv1; - if (du == NULL || bp->bio_blkno < 0 || + if (du == NULL || bp->bio_pblkno < 0 || bp->bio_bcount % DEV_BSIZE != 0) { bp->bio_error = EINVAL; diff --git a/sys/pc98/pc98/wd_cd.c b/sys/pc98/pc98/wd_cd.c index ff504a8..31a25d2 100644 --- a/sys/pc98/pc98/wd_cd.c +++ b/sys/pc98/pc98/wd_cd.c @@ -432,7 +432,6 @@ acdstrategy(struct bio *bp) return; } - bp->bio_pblkno = bp->bio_blkno; bp->bio_resid = bp->bio_bcount; x = splbio(); @@ -479,11 +478,7 @@ acd_start(struct acd *cdp) } if (bp->bio_cmd == BIO_READ) -#ifdef NOTYET lba = bp->bio_offset / cdp->block_size; -#else - lba = bp->bio_blkno / (cdp->block_size / DEV_BSIZE); -#endif else lba = cdp->next_writeable_lba + (bp->bio_offset / cdp->block_size); blocks = (bp->bio_bcount + (cdp->block_size - 1)) / cdp->block_size; -- cgit v1.1