29c29
< __FBSDID("$FreeBSD: head/sys/dev/ips/ips_disk.c 120329 2003-09-22 04:59:07Z njl $");
---
> __FBSDID("$FreeBSD: head/sys/dev/ips/ips_disk.c 125975 2004-02-18 21:36:53Z phk $");
125,130c125,131
< dsc->ipsd_disk.d_drv1 = dsc;
< dsc->ipsd_disk.d_name = "ipsd";
< dsc->ipsd_disk.d_maxsize = IPS_MAX_IO_SIZE;
< dsc->ipsd_disk.d_open = ipsd_open;
< dsc->ipsd_disk.d_close = ipsd_close;
< dsc->ipsd_disk.d_strategy = ipsd_strategy;
---
> dsc->ipsd_disk = disk_alloc();
> dsc->ipsd_disk->d_drv1 = dsc;
> dsc->ipsd_disk->d_name = "ipsd";
> dsc->ipsd_disk->d_maxsize = IPS_MAX_IO_SIZE;
> dsc->ipsd_disk->d_open = ipsd_open;
> dsc->ipsd_disk->d_close = ipsd_close;
> dsc->ipsd_disk->d_strategy = ipsd_strategy;
135,136c136,137
< dsc->ipsd_disk.d_fwheads = IPS_NORM_HEADS;
< dsc->ipsd_disk.d_fwsectors = IPS_NORM_SECTORS;
---
> dsc->ipsd_disk->d_fwheads = IPS_NORM_HEADS;
> dsc->ipsd_disk->d_fwsectors = IPS_NORM_SECTORS;
138,139c139,140
< dsc->ipsd_disk.d_fwheads = IPS_COMP_HEADS;
< dsc->ipsd_disk.d_fwsectors = IPS_COMP_SECTORS;
---
> dsc->ipsd_disk->d_fwheads = IPS_COMP_HEADS;
> dsc->ipsd_disk->d_fwsectors = IPS_COMP_SECTORS;
141,143c142,146
< dsc->ipsd_disk.d_sectorsize = IPS_BLKSIZE;
< dsc->ipsd_disk.d_mediasize = (off_t)totalsectors * IPS_BLKSIZE;
< disk_create(dsc->unit, &dsc->ipsd_disk, 0, NULL, NULL);
---
> dsc->ipsd_disk->d_sectorsize = IPS_BLKSIZE;
> dsc->ipsd_disk->d_mediasize = (off_t)totalsectors * IPS_BLKSIZE;
> dsc->ipsd_disk->d_unit = dsc->unit;
> dsc->ipsd_disk->d_flags = DISKFLAG_NEEDSGIANT;
> disk_create(dsc->ipsd_disk, DISK_VERSION);
158c161
< disk_destroy(&dsc->ipsd_disk);
---
> disk_destroy(dsc->ipsd_disk);
< __FBSDID("$FreeBSD: head/sys/dev/ips/ips_disk.c 120329 2003-09-22 04:59:07Z njl $");
---
> __FBSDID("$FreeBSD: head/sys/dev/ips/ips_disk.c 125975 2004-02-18 21:36:53Z phk $");
125,130c125,131
< dsc->ipsd_disk.d_drv1 = dsc;
< dsc->ipsd_disk.d_name = "ipsd";
< dsc->ipsd_disk.d_maxsize = IPS_MAX_IO_SIZE;
< dsc->ipsd_disk.d_open = ipsd_open;
< dsc->ipsd_disk.d_close = ipsd_close;
< dsc->ipsd_disk.d_strategy = ipsd_strategy;
---
> dsc->ipsd_disk = disk_alloc();
> dsc->ipsd_disk->d_drv1 = dsc;
> dsc->ipsd_disk->d_name = "ipsd";
> dsc->ipsd_disk->d_maxsize = IPS_MAX_IO_SIZE;
> dsc->ipsd_disk->d_open = ipsd_open;
> dsc->ipsd_disk->d_close = ipsd_close;
> dsc->ipsd_disk->d_strategy = ipsd_strategy;
135,136c136,137
< dsc->ipsd_disk.d_fwheads = IPS_NORM_HEADS;
< dsc->ipsd_disk.d_fwsectors = IPS_NORM_SECTORS;
---
> dsc->ipsd_disk->d_fwheads = IPS_NORM_HEADS;
> dsc->ipsd_disk->d_fwsectors = IPS_NORM_SECTORS;
138,139c139,140
< dsc->ipsd_disk.d_fwheads = IPS_COMP_HEADS;
< dsc->ipsd_disk.d_fwsectors = IPS_COMP_SECTORS;
---
> dsc->ipsd_disk->d_fwheads = IPS_COMP_HEADS;
> dsc->ipsd_disk->d_fwsectors = IPS_COMP_SECTORS;
141,143c142,146
< dsc->ipsd_disk.d_sectorsize = IPS_BLKSIZE;
< dsc->ipsd_disk.d_mediasize = (off_t)totalsectors * IPS_BLKSIZE;
< disk_create(dsc->unit, &dsc->ipsd_disk, 0, NULL, NULL);
---
> dsc->ipsd_disk->d_sectorsize = IPS_BLKSIZE;
> dsc->ipsd_disk->d_mediasize = (off_t)totalsectors * IPS_BLKSIZE;
> dsc->ipsd_disk->d_unit = dsc->unit;
> dsc->ipsd_disk->d_flags = DISKFLAG_NEEDSGIANT;
> disk_create(dsc->ipsd_disk, DISK_VERSION);
158c161
< disk_destroy(&dsc->ipsd_disk);
---
> disk_destroy(dsc->ipsd_disk);