49c49
< __FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_cd.c 121602 2003-10-27 06:15:55Z ken $");
---
> __FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_cd.c 125975 2004-02-18 21:36:53Z phk $");
162c162
< struct disk disk;
---
> struct disk *disk;
501c501
< disk_destroy(&softc->disk);
---
> disk_destroy(softc->disk);
739c739,740
< softc->disk.d_devstat = devstat_new_entry("cd",
---
> softc->disk = disk_alloc();
> softc->disk->d_devstat = devstat_new_entry("cd",
744,750c745,753
< softc->disk.d_open = cdopen;
< softc->disk.d_close = cdclose;
< softc->disk.d_strategy = cdstrategy;
< softc->disk.d_ioctl = cdioctl;
< softc->disk.d_name = "cd";
< disk_create(periph->unit_number, &softc->disk, 0, NULL, NULL);
< softc->disk.d_drv1 = periph;
---
> softc->disk->d_open = cdopen;
> softc->disk->d_close = cdclose;
> softc->disk->d_strategy = cdstrategy;
> softc->disk->d_ioctl = cdioctl;
> softc->disk->d_name = "cd";
> softc->disk->d_unit = periph->unit_number;
> softc->disk->d_drv1 = periph;
> softc->disk->d_flags = DISKFLAG_NEEDSGIANT;
> disk_create(softc->disk, DISK_VERSION);
1062c1065
< softc->disk.d_devstat->flags |= DEVSTAT_BS_UNAVAILABLE;
---
> softc->disk->d_devstat->flags |= DEVSTAT_BS_UNAVAILABLE;
1356c1359
< softc->disk.d_devstat);
---
> softc->disk->d_devstat);
1512c1515
< devstat_start_transaction_bio(softc->disk.d_devstat, bp);
---
> devstat_start_transaction_bio(softc->disk->d_devstat, bp);
1668c1671
< biofinish(bp, softc->disk.d_devstat, 0);
---
> biofinish(bp, softc->disk->d_devstat, 0);
2722,2724c2725,2727
< softc->disk.d_maxsize = DFLTPHYS;
< softc->disk.d_sectorsize = 0;
< softc->disk.d_mediasize = 0;
---
> softc->disk->d_maxsize = DFLTPHYS;
> softc->disk->d_sectorsize = 0;
> softc->disk->d_mediasize = 0;
2824,2826c2827,2829
< softc->disk.d_maxsize = DFLTPHYS;
< softc->disk.d_sectorsize = softc->params.blksize;
< softc->disk.d_mediasize =
---
> softc->disk->d_maxsize = DFLTPHYS;
> softc->disk->d_sectorsize = softc->params.blksize;
> softc->disk->d_mediasize =
2838,2840c2841,2843
< if ((softc->disk.d_devstat->flags & DEVSTAT_BS_UNAVAILABLE) != 0)
< softc->disk.d_devstat->flags &= ~DEVSTAT_BS_UNAVAILABLE;
< softc->disk.d_devstat->block_size = softc->params.blksize;
---
> if ((softc->disk->d_devstat->flags & DEVSTAT_BS_UNAVAILABLE) != 0)
> softc->disk->d_devstat->flags &= ~DEVSTAT_BS_UNAVAILABLE;
> softc->disk->d_devstat->block_size = softc->params.blksize;