From owner-svn-src-projects@FreeBSD.ORG  Sun Mar 31 17:50:02 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 5746EC60;
 Sun, 31 Mar 2013 17:50:02 +0000 (UTC)
 (envelope-from cherry@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4A8558A5;
 Sun, 31 Mar 2013 17:50:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2VHo1SE031603;
 Sun, 31 Mar 2013 17:50:01 GMT (envelope-from cherry@svn.freebsd.org)
Received: (from cherry@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2VHo1iX031602;
 Sun, 31 Mar 2013 17:50:01 GMT (envelope-from cherry@svn.freebsd.org)
Message-Id: <201303311750.r2VHo1iX031602@svn.freebsd.org>
From: "Cherry G. Mathew" <cherry@FreeBSD.org>
Date: Sun, 31 Mar 2013 17:50:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r248952 - projects/amd64_xen_pv/sys/xen/xenbus
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 Mar 2013 17:50:02 -0000

Author: cherry
Date: Sun Mar 31 17:50:01 2013
New Revision: 248952
URL: http://svnweb.freebsd.org/changeset/base/248952

Log:
  Do not defer disestablishing intrhooks when there are pending
  connecting device children. Any hooks that children establish will be
  run at SI_SUB_INT_CONFIG_HOOKS and in the order of registration, and
  thus the order of intrhook registration and running should reflect the
  device hierarchy.
  
  This patch takes the boot to vfsmountroot()
  
  Approved by: gibbs(implicit)

Modified:
  projects/amd64_xen_pv/sys/xen/xenbus/xenbusb.c

Modified: projects/amd64_xen_pv/sys/xen/xenbus/xenbusb.c
==============================================================================
--- projects/amd64_xen_pv/sys/xen/xenbus/xenbusb.c	Sun Mar 31 17:42:54 2013	(r248951)
+++ projects/amd64_xen_pv/sys/xen/xenbus/xenbusb.c	Sun Mar 31 17:50:01 2013	(r248952)
@@ -594,8 +594,7 @@ xenbusb_release_confighook(struct xenbus
 	KASSERT(xbs->xbs_connecting_children > 0,
 		("Connecting device count error\n"));
 	xbs->xbs_connecting_children--;
-	if (xbs->xbs_connecting_children == 0
-	 && (xbs->xbs_flags & XBS_ATTACH_CH_ACTIVE) != 0) {
+	if ((xbs->xbs_flags & XBS_ATTACH_CH_ACTIVE) != 0) {
 		xbs->xbs_flags &= ~XBS_ATTACH_CH_ACTIVE;
 		mtx_unlock(&xbs->xbs_lock);
 		config_intrhook_disestablish(&xbs->xbs_attach_ch);