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

Work around the problem that some CDROM drives might return different

Browse Source 
TOC's for the same media!! that borks up GEOM.
Although this looks like bad HW the following patch removes the
chance for GEOM panic'ing.

Approved by: re@
This commit is contained in:
Søren Schmidt 2003-11-18 15:23:37 +00:00
parent 3fed54aaaa
commit d7536ac93e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/ata/atapi-cd.c
View File

@ -1186,13 +1186,15 @@ acd_read_toc(struct acd_softc *cdp)
int8_t ccb[16];
struct g_provider *pp;
bzero(&cdp->toc, sizeof(cdp->toc));
bzero(ccb, sizeof(ccb));
if (acd_test_ready(cdp->device))
return;
if (acd_test_ready(cdp->device) != 0)
if (!(cdp->device->flags & ATA_D_MEDIA_CHANGED))
return;
cdp->device->flags &= ~ATA_D_MEDIA_CHANGED;
bzero(&cdp->toc, sizeof(cdp->toc));
bzero(ccb, sizeof(ccb));
cdp->disk_size = -1; /* hack for GEOM SOS */
len = sizeof(struct ioc_toc_header) + sizeof(struct cd_toc_entry);