diff options
| author | scottl <scottl@FreeBSD.org> | 2003-02-26 02:50:27 +0000 |
|---|---|---|
| committer | scottl <scottl@FreeBSD.org> | 2003-02-26 02:50:27 +0000 |
| commit | 0768d6627f9ab4ca46c37d238c66923114d6aec7 (patch) | |
| tree | 07adceb2f4462e75aa3ebaf6dc6b8e668d02809d /sys/dev/aac/aac.c | |
| parent | 186c547c811f347f945817e5b39472f95b963d42 (diff) | |
| download | FreeBSD-src-0768d6627f9ab4ca46c37d238c66923114d6aec7.zip FreeBSD-src-0768d6627f9ab4ca46c37d238c66923114d6aec7.tar.gz | |
Move to 'struct disk*' API
Submitted by: phk
Diffstat (limited to 'sys/dev/aac/aac.c')
| -rw-r--r-- | sys/dev/aac/aac.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c index aad1dcb..49cef38 100644 --- a/sys/dev/aac/aac.c +++ b/sys/dev/aac/aac.c @@ -899,7 +899,7 @@ aac_submit_bio(struct bio *bp) debug_called(2); - ad = (struct aac_disk *)bp->bio_dev->si_drv1; + ad = (struct aac_disk *)bp->bio_disk->d_drv1; sc = ad->ad_controller; /* queue the BIO and try to get some work done */ @@ -952,7 +952,7 @@ aac_bio_command(struct aac_softc *sc, struct aac_command **cmp) fib->Header.Size = sizeof(struct aac_fib_header); /* build the read/write request */ - ad = (struct aac_disk *)bp->bio_dev->si_drv1; + ad = (struct aac_disk *)bp->bio_disk->d_drv1; if (BIO_IS_READ(bp)) { br = (struct aac_blockread *)&fib->data[0]; br->Command = VM_CtBlockRead; @@ -2716,8 +2716,8 @@ aac_query_disk(struct aac_softc *sc, caddr_t uptr) query_disk.Target = disk->unit; query_disk.Lun = 0; query_disk.UnMapped = 0; - bcopy(disk->ad_dev_t->si_name, - &query_disk.diskDeviceName[0], 10); + sprintf(&query_disk.diskDeviceName[0], "%s%d", + disk->ad_disk.d_name, disk->ad_disk.d_unit); } AAC_LOCK_RELEASE(&sc->aac_container_lock); |
