From c951adca24b1bfebb3ef74a81858fd6ed52f1713 Mon Sep 17 00:00:00 2001 From: kib Date: Wed, 2 Apr 2008 11:11:58 +0000 Subject: [PATCH] Add two missed chunks from the rev. 1.210, for the giant_read() and giant_ioctl(). PR: kern/122287 MFC after: 3 days --- sys/kern/kern_conf.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index 939feea22ce8..1db25f8a8a61 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);