Date: Fri, 29 May 2009 19:37:17 +0000 (UTC) From: Ulf Lilleengen <lulf@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r193053 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb geom Message-ID: <200905291937.n4TJbHek084515@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lulf Date: Fri May 29 19:37:17 2009 New Revision: 193053 URL: http://svn.freebsd.org/changeset/base/193053 Log: MFC r179097: - Assert that we don't send new provider event for a provider which has G_PF_WITHER flag set. - Fix typo in assertion condition (sorry, but I forgot who report that). MFC r179151: Force commit to note, that the typo in KASSERT() was: PR: kern/116896 Reported by: VANHULLEBUS Yvan <vanhu@netasq.com> Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) stable/7/sys/geom/geom_subr.c Modified: stable/7/sys/geom/geom_subr.c ============================================================================== --- stable/7/sys/geom/geom_subr.c Fri May 29 19:27:52 2009 (r193052) +++ stable/7/sys/geom/geom_subr.c Fri May 29 19:37:17 2009 (r193053) @@ -531,6 +531,8 @@ g_new_provider_event(void *arg, int flag return; pp = arg; G_VALID_PROVIDER(pp); + KASSERT(!(pp->flags & G_PF_WITHER), + ("g_new_provider_event but withered")); LIST_FOREACH(mp, &g_classes, class) { if (mp->taste == NULL) continue; @@ -620,7 +622,7 @@ g_destroy_provider(struct g_provider *pp ("g_destroy_provider but attached")); KASSERT (pp->acr == 0, ("g_destroy_provider with acr")); KASSERT (pp->acw == 0, ("g_destroy_provider with acw")); - KASSERT (pp->acw == 0, ("g_destroy_provider with ace")); + KASSERT (pp->ace == 0, ("g_destroy_provider with ace")); g_cancel_event(pp); LIST_REMOVE(pp, provider); gp = pp->geom;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905291937.n4TJbHek084515>