diff options
| author | kib <kib@FreeBSD.org> | 2016-05-20 08:22:20 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-05-20 08:22:20 +0000 |
| commit | 0ffe69ace21f6fc313b8ecfb9e6e224e587fd7a0 (patch) | |
| tree | 8122488ce12013776d383a0469ac0c255ebb4c84 | |
| parent | fef1306667f374fe645a193749fc3c73ccdb63a8 (diff) | |
| download | FreeBSD-src-0ffe69ace21f6fc313b8ecfb9e6e224e587fd7a0.zip FreeBSD-src-0ffe69ace21f6fc313b8ecfb9e6e224e587fd7a0.tar.gz | |
Remove asserts that Giant is not held on entrance into geom KPI, which
outlived their usefulness. This allows to remove drop/pickup Giant
wrappers around GEOM calls.
Discussed with: alfred, imp, phk
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | sys/geom/geom.h | 1 | ||||
| -rw-r--r-- | sys/geom/geom_event.c | 1 | ||||
| -rw-r--r-- | sys/geom/geom_kern.c | 3 |
3 files changed, 0 insertions, 5 deletions
diff --git a/sys/geom/geom.h b/sys/geom/geom.h index 98b53dc..b261693 100644 --- a/sys/geom/geom.h +++ b/sys/geom/geom.h @@ -371,7 +371,6 @@ g_free(void *ptr) #define g_topology_lock() \ do { \ - mtx_assert(&Giant, MA_NOTOWNED); \ sx_xlock(&topology_lock); \ } while (0) diff --git a/sys/geom/geom_event.c b/sys/geom/geom_event.c index 2ded638..3c2ee49 100644 --- a/sys/geom/geom_event.c +++ b/sys/geom/geom_event.c @@ -83,7 +83,6 @@ g_waitidle(void) { g_topology_assert_not(); - mtx_assert(&Giant, MA_NOTOWNED); mtx_lock(&g_eventlock); while (!TAILQ_EMPTY(&g_events)) diff --git a/sys/geom/geom_kern.c b/sys/geom/geom_kern.c index dbced0f..52a4d36 100644 --- a/sys/geom/geom_kern.c +++ b/sys/geom/geom_kern.c @@ -90,7 +90,6 @@ static void g_up_procbody(void *arg) { - mtx_assert(&Giant, MA_NOTOWNED); thread_lock(g_up_td); sched_prio(g_up_td, PRIBIO); thread_unlock(g_up_td); @@ -103,7 +102,6 @@ static void g_down_procbody(void *arg) { - mtx_assert(&Giant, MA_NOTOWNED); thread_lock(g_down_td); sched_prio(g_down_td, PRIBIO); thread_unlock(g_down_td); @@ -116,7 +114,6 @@ static void g_event_procbody(void *arg) { - mtx_assert(&Giant, MA_NOTOWNED); thread_lock(g_event_td); sched_prio(g_event_td, PRIBIO); thread_unlock(g_event_td); |
