Date: Wed, 1 Jul 2009 20:16:29 +0000 (UTC) From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r195257 - head/sys/geom Message-ID: <200907012016.n61KGTSe022828@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: trasz Date: Wed Jul 1 20:16:29 2009 New Revision: 195257 URL: http://svn.freebsd.org/changeset/base/195257 Log: Fix a panic which (reportedly) can happen when unmounting a filesystem with I/O requests in flight on kernels compiled with "options INVARIANTS". Also, make it obvious it's not right to call g_valid_obj() (and macros using it, e.g. G_VALID_CONSUMER()) without topology lock held. Approved by: re (kib) Reported by: pho Modified: head/sys/geom/geom_subr.c head/sys/geom/geom_vfs.c Modified: head/sys/geom/geom_subr.c ============================================================================== --- head/sys/geom/geom_subr.c Wed Jul 1 20:07:44 2009 (r195256) +++ head/sys/geom/geom_subr.c Wed Jul 1 20:16:29 2009 (r195257) @@ -1025,6 +1025,8 @@ g_valid_obj(void const *ptr) struct g_consumer *cp; struct g_provider *pp; + g_topology_assert(); + LIST_FOREACH(mp, &g_classes, class) { if (ptr == mp) return (1); Modified: head/sys/geom/geom_vfs.c ============================================================================== --- head/sys/geom/geom_vfs.c Wed Jul 1 20:07:44 2009 (r195256) +++ head/sys/geom/geom_vfs.c Wed Jul 1 20:16:29 2009 (r195257) @@ -106,7 +106,7 @@ g_vfs_strategy(struct bufobj *bo, struct int vfslocked; cp = bo->bo_private; - G_VALID_CONSUMER(cp); + /* G_VALID_CONSUMER(cp); We likely lack topology lock */ /* * If the the provider has orphaned us, just return EXIO.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907012016.n61KGTSe022828>