From 81a0028ff2d2c391933f52b57222858afc9a5f56 Mon Sep 17 00:00:00 2001 From: kib Date: Thu, 5 Jul 2007 13:04:59 +0000 Subject: Revert destroy_dev() to the state before destroy_dev_sched() was introduced. Attempt to spawn destroy_dev_sched() from it causes inadmissible races. Requested by: tegge Approved by: re (kensmith) --- sys/kern/kern_conf.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index 751f524..c2b8fbf 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -782,16 +782,10 @@ destroy_devl(struct cdev *dev) void destroy_dev(struct cdev *dev) { - struct cdevsw *csw; dev_lock(); - csw = dev->si_devsw; - if ((csw != NULL && csw->d_purge != NULL) || - dev->si_threadcount == 0) { - destroy_devl(dev); - dev_unlock_and_free(); - } else - destroy_dev_sched_cbl(dev, NULL, NULL); + destroy_devl(dev); + dev_unlock_and_free(); } const char * -- cgit v1.1