From owner-svn-src-stable-8@FreeBSD.ORG Mon Aug 16 08:48:39 2010 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB3AD106566B; Mon, 16 Aug 2010 08:48:39 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B9A108FC1A; Mon, 16 Aug 2010 08:48:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7G8mdpB090048; Mon, 16 Aug 2010 08:48:39 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7G8md65090046; Mon, 16 Aug 2010 08:48:39 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201008160848.o7G8md65090046@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Mon, 16 Aug 2010 08:48:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r211390 - stable/8/sys/geom/part X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2010 08:48:39 -0000 Author: ae Date: Mon Aug 16 08:48:39 2010 New Revision: 211390 URL: http://svn.freebsd.org/changeset/base/211390 Log: MFC r210746: Release access for consumers that are opened, but will be destroyed indirectly by orphan method. PR: 148688 MFC r210792: Check that table is not NULL before access, it can be NULL for some cases. Approved by: kib (mentor) Modified: stable/8/sys/geom/part/g_part.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cam/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/e1000/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/geom/part/g_part.c ============================================================================== --- stable/8/sys/geom/part/g_part.c Mon Aug 16 04:22:29 2010 (r211389) +++ stable/8/sys/geom/part/g_part.c Mon Aug 16 08:48:39 2010 (r211390) @@ -1738,6 +1738,7 @@ static void g_part_orphan(struct g_consumer *cp) { struct g_provider *pp; + struct g_part_table *table; pp = cp->provider; KASSERT(pp != NULL, (__func__)); @@ -1745,6 +1746,9 @@ g_part_orphan(struct g_consumer *cp) g_topology_assert(); KASSERT(pp->error != 0, (__func__)); + table = cp->geom->softc; + if (table != NULL && table->gpt_opened) + g_access(cp, -1, -1, -1); g_part_wither(cp->geom, pp->error); }