diff options
| author | kib <kib@FreeBSD.org> | 2008-04-02 11:11:58 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2008-04-02 11:11:58 +0000 |
| commit | c951adca24b1bfebb3ef74a81858fd6ed52f1713 (patch) | |
| tree | bddb126f1a8ad92e28a79d2ea5b77f4bbf5c4ca0 /sys/kern/kern_conf.c | |
| parent | 639ca8f21b04fc75a1084ba1d38635e3716dd4e6 (diff) | |
| download | FreeBSD-src-c951adca24b1bfebb3ef74a81858fd6ed52f1713.zip FreeBSD-src-c951adca24b1bfebb3ef74a81858fd6ed52f1713.tar.gz | |
Add two missed chunks from the rev. 1.210, for the giant_read() and
giant_ioctl().
PR: kern/122287
MFC after: 3 days
Diffstat (limited to 'sys/kern/kern_conf.c')
| -rw-r--r-- | sys/kern/kern_conf.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index 939feea..1db25f8 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -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); |
