diff options
| author | phk <phk@FreeBSD.org> | 2004-10-23 20:52:15 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-10-23 20:52:15 +0000 |
| commit | 80dc3e1bc2d61be3d57a34c9fdb4d5c0f07d93ea (patch) | |
| tree | 32bcaff00febc2a2fd92dd254954c053f4a9890e /sys/geom | |
| parent | c93e5e1f963975553cd68dc0100ed6536d97461a (diff) | |
| download | FreeBSD-src-80dc3e1bc2d61be3d57a34c9fdb4d5c0f07d93ea.zip FreeBSD-src-80dc3e1bc2d61be3d57a34c9fdb4d5c0f07d93ea.tar.gz | |
Don't call g_waitidle(), it happens automagically now.
Diffstat (limited to 'sys/geom')
| -rw-r--r-- | sys/geom/geom_ctl.c | 5 | ||||
| -rw-r--r-- | sys/geom/geom_dev.c | 3 | ||||
| -rw-r--r-- | sys/geom/geom_subr.c | 1 |
3 files changed, 3 insertions, 6 deletions
diff --git a/sys/geom/geom_ctl.c b/sys/geom/geom_ctl.c index ce000f3..b3e046f 100644 --- a/sys/geom/geom_ctl.c +++ b/sys/geom/geom_ctl.c @@ -447,6 +447,7 @@ static int g_ctl_ioctl_ctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct thread *td) { struct gctl_req *req; + int nerror; req = (void *)data; req->nerror = 0; @@ -473,9 +474,9 @@ g_ctl_ioctl_ctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct th gctl_copyout(req); } - g_waitidle(); + nerror = req->nerror; gctl_free(req); - return (req->nerror); + return (nerror); } static int diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c index 5bb9d42..8b44882 100644 --- a/sys/geom/geom_dev.c +++ b/sys/geom/geom_dev.c @@ -187,7 +187,6 @@ g_dev_open(struct cdev *dev, int flags, int fmt, struct thread *td) else error = g_access(cp, r, w, e); g_topology_unlock(); - g_waitidle(); if (!error) dev->si_bsize_phys = cp->provider->sectorsize; return(error); @@ -233,7 +232,6 @@ g_dev_close(struct cdev *dev, int flags, int fmt, struct thread *td) "Completing close anyway, panic may happen later."); } g_topology_unlock(); - g_waitidle(); return (error); } @@ -307,7 +305,6 @@ g_dev_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct thread } } - g_waitidle(); return (error); } diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c index b0db5be..506f919 100644 --- a/sys/geom/geom_subr.c +++ b/sys/geom/geom_subr.c @@ -228,7 +228,6 @@ g_modevent(module_t mod, int type, void *data) if (error == 0) error = hh->error; if (error == 0) { - g_waitidle(); KASSERT(LIST_EMPTY(&hh->mp->geom), ("Unloaded class (%s) still has geom", hh->mp->name)); } |
