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

Add two missed chunks from the rev. 1.210, for the giant_read() and

Browse Source 
giant_ioctl().

PR:	kern/122287
MFC after:	3 days
This commit is contained in:
Konstantin Belousov 2008-04-02 11:11:58 +00:00
parent 1fd9b6a577
commit 35b450291a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=177858
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/kern_conf.c
View File

@ -402,8 +402,7 @@ giant_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct thread
if (dsw == NULL)
return (ENXIO);
mtx_lock(&Giant);
retval = dev->si_devsw->d_gianttrick->
d_ioctl(dev, cmd, data, fflag, td);
retval = dsw->d_gianttrick->d_ioctl(dev, cmd, data, fflag, td);
mtx_unlock(&Giant);
dev_relthread(dev);
return (retval);
@ -419,8 +418,7 @@ giant_read(struct cdev *dev, struct uio *uio, int ioflag)
if (dsw == NULL)
return (ENXIO);
mtx_lock(&Giant);
retval = dev->si_devsw->d_gianttrick->
d_read(dev, uio, ioflag);
retval = dsw->d_gianttrick->d_read(dev, uio, ioflag);
mtx_unlock(&Giant);
dev_relthread(dev);
return (retval);