src/sys/bus/cam/scsi/scsi_cd.c - diff

Return to scsi_cd.c CVS log

Up to [DragonFly] / src / sys / bus / cam / scsi

version 1.14, 2004/05/13 23:49:11	version 1.15, 2004/05/19 22:52:38
Line 545 cdcleanup(struct cam_periph *periph)	Line 545 cdcleanup(struct cam_periph *periph)
}	}
devstat_remove_entry(&softc->device_stats);	devstat_remove_entry(&softc->device_stats);
cam_extend_release(cdperiphs, periph->unit_number);	cam_extend_release(cdperiphs, periph->unit_number);
if (softc->disk.d_dev) {	if (softc->disk.d_rawdev) {
disk_destroy(&softc->disk);	disk_destroy(&softc->disk);
}	}
free(softc, M_DEVBUF);	free(softc, M_DEVBUF);
Line 2856 cdcheckmedia(struct cam_periph *periph)	Line 2856 cdcheckmedia(struct cam_periph *periph)
* We don't bother checking the return value here,	* We don't bother checking the return value here,
* since we already have an error...	* since we already have an error...
*/	*/
dsioctl(softc->disk.d_dev, DIOCSYNCSLICEINFO,	dsioctl(softc->disk.d_cdev, DIOCSYNCSLICEINFO,
/data/(caddr_t)&force, /flags/ 0,	/data/(caddr_t)&force, /flags/ 0,
&softc->disk.d_slice);	&softc->disk.d_slice);
}	}
Line 2887 cdcheckmedia(struct cam_periph *periph)	Line 2887 cdcheckmedia(struct cam_periph *periph)

force = 1;	force = 1;

error = dsioctl(softc->disk.d_dev, DIOCSYNCSLICEINFO,	error = dsioctl(softc->disk.d_cdev, DIOCSYNCSLICEINFO,
/data/(caddr_t)&force, /flags/ 0,	/data/(caddr_t)&force, /flags/ 0,
&softc->disk.d_slice);	&softc->disk.d_slice);
if (error != 0) {	if (error != 0) {