d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add disk_destroy() call to detach processing.

Browse Source 
Add short tempered TUR to cdsize() as a workaround.
This commit is contained in:
phk 2003-10-06 10:39:13 +00:00
parent 892a2cd235
commit 74674b8ed8
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/cam/scsi/scsi_cd.c
View File

@ -496,6 +496,7 @@ cdcleanup(struct cam_periph *periph)
free(softc->changer, M_DEVBUF);
num_changers--;
}
disk_destroy(&softc->disk);
free(softc, M_DEVBUF);
splx(s);
}
@ -2852,6 +2853,20 @@ cdsize(struct cam_periph *periph, u_int32_t *size)
ccb = cdgetccb(periph, /* priority */ 1);
scsi_test_unit_ready(&ccb->csio, 0, cddone,
MSG_SIMPLE_Q_TAG, SSD_FULL_SIZE, 1000);
ccb->ccb_h.ccb_bp = NULL;
error = cam_periph_runccb(ccb, NULL,
/*cam_flags*/0,
/*sense_flags*/SF_RETRY_UA,
softc->disk.d_devstat);
if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
xpt_release_ccb(ccb);
return (ENXIO);
}
rcap_buf = malloc(sizeof(struct scsi_read_capacity_data),
M_TEMP, M_WAITOK);