mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-13 10:02:38 +00:00
Code Issues Releases Activity

Hold proper thread count while frobbing drivers ioctl.

Browse Source
This commit is contained in:
Poul-Henning Kamp 2004-09-24 07:24:02 +00:00
parent 8f7bea8b99
commit 9bd188b936
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=135722
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/fs/cd9660/cd9660_vfsops.c
View File

@ -108,27 +108,34 @@ iso_get_ssector(dev, td)
{
struct ioc_toc_header h;
struct ioc_read_toc_single_entry t;
int i;
int i, error;
struct cdevsw *bd;
d_ioctl_t *ioctlp;
bd = devsw(dev);
bd = dev_refthread(dev);
if (bd == NULL)
return 0;
ioctlp = bd->d_ioctl;
if (ioctlp == NULL)
return 0;
if (ioctlp(dev, CDIOREADTOCHEADER, (caddr_t)&h, FREAD, td) != 0)
error = ioctlp(dev, CDIOREADTOCHEADER, (caddr_t)&h, FREAD, td);
if (error) {
dev_relthread(dev);
return 0;
}
for (i = h.ending_track; i >= 0; i--) {
t.address_format = CD_LBA_FORMAT;
t.track = i;
if (ioctlp(dev, CDIOREADTOCENTRY, (caddr_t)&t, FREAD, td) != 0)
error = ioctlp(dev, CDIOREADTOCENTRY, (caddr_t)&t, FREAD, td);
if (error) {
dev_relthread(dev);
return 0;
}
if ((t.entry.control & 4) != 0)
/* found a data track */
break;
}
dev_relthread(dev);
if (i < 0)
return 0;

19
sys/isofs/cd9660/cd9660_vfsops.c
View File

@ -108,27 +108,34 @@ iso_get_ssector(dev, td)
{
struct ioc_toc_header h;
struct ioc_read_toc_single_entry t;
int i;
int i, error;
struct cdevsw *bd;
d_ioctl_t *ioctlp;
bd = devsw(dev);
bd = dev_refthread(dev);
if (bd == NULL)
return 0;
ioctlp = bd->d_ioctl;
if (ioctlp == NULL)
return 0;
if (ioctlp(dev, CDIOREADTOCHEADER, (caddr_t)&h, FREAD, td) != 0)
error = ioctlp(dev, CDIOREADTOCHEADER, (caddr_t)&h, FREAD, td);
if (error) {
dev_relthread(dev);
return 0;
}
for (i = h.ending_track; i >= 0; i--) {
t.address_format = CD_LBA_FORMAT;
t.track = i;
if (ioctlp(dev, CDIOREADTOCENTRY, (caddr_t)&t, FREAD, td) != 0)
error = ioctlp(dev, CDIOREADTOCENTRY, (caddr_t)&t, FREAD, td);
if (error) {
dev_relthread(dev);
return 0;
}
if ((t.entry.control & 4) != 0)
/* found a data track */
break;
}
dev_relthread(dev);
if (i < 0)
return 0;