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

Do not forget to cam_periph_unhold the peripheral before exiting

Browse Source 
due to error.

PR:		kern/114636
Submitted by:	Tijl Coosemans
Approved by:	re (hrs)
This commit is contained in:
kan 2007-07-21 18:07:45 +00:00
parent bfde2cbba6
commit d137611353
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1860,14 +1860,17 @@ cdioctl(struct disk *dp, u_long cmd, void *addr, int flag, struct thread *td)
&& (cmd != CDIOCEJECT))
&& (IOCGROUP(cmd) == 'c')) {
error = cdcheckmedia(periph);
if (error != 0) {
cam_periph_unhold(periph);
cam_periph_unlock(periph);
return (error);
}
}
/*
* Drop the lock here so later mallocs can use WAITOK. The periph
* is essentially locked still with the cam_periph_hold call above.
*/
cam_periph_unlock(periph);
if (error != 0)
return (error);
nocopyout = 0;
switch (cmd) {