From abb50a48e855980e4d406e93aa0b3d4610275d35 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Mon, 13 Jan 2003 08:46:32 +0000 Subject: [PATCH] Remove g_silence(). It does not do anything anymore. --- sys/geom/geom.h | 1 - sys/geom/geom_dev.c | 2 -- sys/geom/geom_event.c | 13 +------------ 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/sys/geom/geom.h b/sys/geom/geom.h index 028e57d8bbb3..fbcc7fdaaf91 100644 --- a/sys/geom/geom.h +++ b/sys/geom/geom.h @@ -207,7 +207,6 @@ void g_trace(int level, const char *, ...); typedef void g_call_me_t(void *); int g_call_me(g_call_me_t *func, void *arg); void g_orphan_provider(struct g_provider *pp, int error); -void g_silence(void); void g_waitidle(void); /* geom_subr.c */ diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c index 3efe0460c62c..8d95d1950ae8 100644 --- a/sys/geom/geom_dev.c +++ b/sys/geom/geom_dev.c @@ -196,7 +196,6 @@ g_dev_open(dev_t dev, int flags, int fmt, struct thread *td) gp->name, flags, fmt, td); DROP_GIANT(); g_topology_lock(); - g_silence(); r = flags & FREAD ? 1 : 0; w = flags & FWRITE ? 1 : 0; #ifdef notyet @@ -227,7 +226,6 @@ g_dev_close(dev_t dev, int flags, int fmt, struct thread *td) gp->name, flags, fmt, td); DROP_GIANT(); g_topology_lock(); - g_silence(); r = flags & FREAD ? -1 : 0; w = flags & FWRITE ? -1 : 0; #ifdef notyet diff --git a/sys/geom/geom_event.c b/sys/geom/geom_event.c index 7a235f4fdf2c..1b657e91a1c0 100644 --- a/sys/geom/geom_event.c +++ b/sys/geom/geom_event.c @@ -62,29 +62,18 @@ #include static struct event_tailq_head g_events = TAILQ_HEAD_INITIALIZER(g_events); -static u_int g_pending_events, g_silence_events; +static u_int g_pending_events; static void g_do_event(struct g_event *ep); static TAILQ_HEAD(,g_provider) g_doorstep = TAILQ_HEAD_INITIALIZER(g_doorstep); static struct mtx g_eventlock; static int g_shutdown; -void -g_silence(void) -{ - - g_silence_events = 1; -} - void g_waitidle(void) { - g_silence_events = 0; - mtx_lock(&Giant); - wakeup(&g_silence_events); while (g_pending_events) tsleep(&g_pending_events, PPAUSE, "g_waitidle", hz/5); - mtx_unlock(&Giant); } void