31c31
< __FBSDID("$FreeBSD: head/sys/dev/aac/aac_disk.c 121307 2003-10-21 18:28:36Z silby $");
---
> __FBSDID("$FreeBSD: head/sys/dev/aac/aac_disk.c 125975 2004-02-18 21:36:53Z phk $");
360,371c360,373
< sc->ad_disk.d_drv1 = sc;
< sc->ad_disk.d_name = "aacd";
< sc->ad_disk.d_maxsize = aac_iosize_max;
< sc->ad_disk.d_open = aac_disk_open;
< sc->ad_disk.d_close = aac_disk_close;
< sc->ad_disk.d_strategy = aac_disk_strategy;
< sc->ad_disk.d_dump = aac_disk_dump;
< sc->ad_disk.d_sectorsize = AAC_BLOCK_SIZE;
< sc->ad_disk.d_mediasize = (off_t)sc->ad_size * AAC_BLOCK_SIZE;
< sc->ad_disk.d_fwsectors = sc->ad_sectors;
< sc->ad_disk.d_fwheads = sc->ad_heads;
< disk_create(sc->unit, &sc->ad_disk, DISKFLAG_NOGIANT, NULL, NULL);
---
> sc->ad_disk = disk_alloc();
> sc->ad_disk->d_drv1 = sc;
> sc->ad_disk->d_name = "aacd";
> sc->ad_disk->d_maxsize = aac_iosize_max;
> sc->ad_disk->d_open = aac_disk_open;
> sc->ad_disk->d_close = aac_disk_close;
> sc->ad_disk->d_strategy = aac_disk_strategy;
> sc->ad_disk->d_dump = aac_disk_dump;
> sc->ad_disk->d_sectorsize = AAC_BLOCK_SIZE;
> sc->ad_disk->d_mediasize = (off_t)sc->ad_size * AAC_BLOCK_SIZE;
> sc->ad_disk->d_fwsectors = sc->ad_sectors;
> sc->ad_disk->d_fwheads = sc->ad_heads;
> sc->ad_disk->d_unit = sc->unit;
> disk_create(sc->ad_disk, DISK_VERSION);
391c393
< disk_destroy(&sc->ad_disk);
---
> disk_destroy(sc->ad_disk);