summaryrefslogtreecommitdiff
path: root/sys/kern/subr_disk.c
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>2000-04-15 05:54:02 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>2000-04-15 05:54:02 +0000
commit8177437d85f8a1edd437dab643b153d62170135f (patch)
tree15f6a55095e767e8981f2ba8b7d0bc57532ce223 /sys/kern/subr_disk.c
parent9754f5b65bbabf3bbbd935a82ddd82fc5ffa6aa9 (diff)
Notes
Diffstat (limited to 'sys/kern/subr_disk.c')
-rw-r--r--sys/kern/subr_disk.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index 6d812e597258..0838056bedbe 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -173,25 +173,25 @@ diskclose(dev_t dev, int fflag, int devtype, struct proc *p)
}
static void
-diskstrategy(struct buf *bp)
+diskstrategy(struct bio *bp)
{
dev_t pdev;
struct disk *dp;
- dp = bp->b_dev->si_disk;
+ dp = bp->bio_dev->si_disk;
if (!dp) {
- pdev = dkmodpart(dkmodslice(bp->b_dev, WHOLE_DISK_SLICE), RAW_PART);
- dp = bp->b_dev->si_disk = pdev->si_disk;
- bp->b_dev->si_drv1 = pdev->si_drv1;
- bp->b_dev->si_drv2 = pdev->si_drv2;
- bp->b_dev->si_iosize_max = pdev->si_iosize_max;
- bp->b_dev->si_bsize_phys = pdev->si_bsize_phys;
- bp->b_dev->si_bsize_best = pdev->si_bsize_best;
+ pdev = dkmodpart(dkmodslice(bp->bio_dev, WHOLE_DISK_SLICE), RAW_PART);
+ dp = bp->bio_dev->si_disk = pdev->si_disk;
+ bp->bio_dev->si_drv1 = pdev->si_drv1;
+ bp->bio_dev->si_drv2 = pdev->si_drv2;
+ bp->bio_dev->si_iosize_max = pdev->si_iosize_max;
+ bp->bio_dev->si_bsize_phys = pdev->si_bsize_phys;
+ bp->bio_dev->si_bsize_best = pdev->si_bsize_best;
}
if (!dp) {
- bp->b_error = ENXIO;
- bp->b_ioflags |= BIO_ERROR;
+ bp->bio_error = ENXIO;
+ bp->bio_flags |= BIO_ERROR;
biodone(bp);
return;
}