diff options
| author | phk <phk@FreeBSD.org> | 2003-02-21 23:25:43 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-02-21 23:25:43 +0000 |
| commit | 8f9640b59b8e96419f4a29f1d543688c4725ad15 (patch) | |
| tree | 9111e50906c81290c46b302d486c51d931aec79c /sys/dev/ccd | |
| parent | f679a324165265f878b7bc86d52b1a5e731388f9 (diff) | |
| download | FreeBSD-src-8f9640b59b8e96419f4a29f1d543688c4725ad15.zip FreeBSD-src-8f9640b59b8e96419f4a29f1d543688c4725ad15.tar.gz | |
NO_GEOM cleanup: Convert CCD(4) to be use "struct disk*" instead of "dev_t"
as "this" handle.
Diffstat (limited to 'sys/dev/ccd')
| -rw-r--r-- | sys/dev/ccd/ccd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c index 5fb49c5..4fe4f98 100644 --- a/sys/dev/ccd/ccd.c +++ b/sys/dev/ccd/ccd.c @@ -107,7 +107,7 @@ struct ccdbuf { static dev_t ccdctldev; -static d_strategy_t ccdstrategy; +static disk_strategy_t ccdstrategy; static d_ioctl_t ccdctlioctl; #define NCCDFREEHIWAT 16 @@ -537,7 +537,7 @@ ccdstrategy(struct bio *bp) int pbn; /* in sc_secsize chunks */ long sz; /* in sc_secsize chunks */ - cs = bp->bio_dev->si_drv1; + cs = bp->bio_disk->d_drv1; pbn = bp->bio_blkno / (cs->sc_geom.ccg_secsize / DEV_BSIZE); sz = howmany(bp->bio_bcount, cs->sc_geom.ccg_secsize); @@ -1133,9 +1133,9 @@ ccdioctltoo(int unit, u_long cmd, caddr_t data, int flag, struct thread *td) cs->sc_size * (off_t)ccg->ccg_secsize; cs->sc_disk->d_fwsectors = ccg->ccg_nsectors; cs->sc_disk->d_fwheads = ccg->ccg_ntracks; - cs->sc_dev = disk_create(unit, cs->sc_disk, 0, NULL, NULL); - cs->sc_dev->si_drv1 = cs; - cs->sc_dev->si_iosize_max = MAXPHYS; + cs->sc_disk->d_drv1 = cs; + cs->sc_disk->d_maxsize = MAXPHYS; + disk_create(unit, cs->sc_disk, 0, NULL, NULL); ccdunlock(cs); |
