From owner-svn-src-all@freebsd.org Fri May 20 08:22:22 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5FDEAB42DE0; Fri, 20 May 2016 08:22:22 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 129DE139F; Fri, 20 May 2016 08:22:22 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4K8MLFd018557; Fri, 20 May 2016 08:22:21 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4K8MLHp018554; Fri, 20 May 2016 08:22:21 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201605200822.u4K8MLHp018554@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Fri, 20 May 2016 08:22:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300287 - head/sys/geom X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 May 2016 08:22:22 -0000 Author: kib Date: Fri May 20 08:22:20 2016 New Revision: 300287 URL: https://svnweb.freebsd.org/changeset/base/300287 Log: 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 Modified: head/sys/geom/geom.h head/sys/geom/geom_event.c head/sys/geom/geom_kern.c Modified: head/sys/geom/geom.h ============================================================================== --- head/sys/geom/geom.h Fri May 20 07:18:33 2016 (r300286) +++ head/sys/geom/geom.h Fri May 20 08:22:20 2016 (r300287) @@ -371,7 +371,6 @@ g_free(void *ptr) #define g_topology_lock() \ do { \ - mtx_assert(&Giant, MA_NOTOWNED); \ sx_xlock(&topology_lock); \ } while (0) Modified: head/sys/geom/geom_event.c ============================================================================== --- head/sys/geom/geom_event.c Fri May 20 07:18:33 2016 (r300286) +++ head/sys/geom/geom_event.c Fri May 20 08:22:20 2016 (r300287) @@ -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)) Modified: head/sys/geom/geom_kern.c ============================================================================== --- head/sys/geom/geom_kern.c Fri May 20 07:18:33 2016 (r300286) +++ head/sys/geom/geom_kern.c Fri May 20 08:22:20 2016 (r300287) @@ -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);