From owner-svn-src-all@FreeBSD.ORG  Tue Jun 29 17:10:56 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F29961065677;
	Tue, 29 Jun 2010 17:10:55 +0000 (UTC)
	(envelope-from mjacob@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A41F98FC1F;
	Tue, 29 Jun 2010 17:10:55 +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 o5THAtXM084579;
	Tue, 29 Jun 2010 17:10:55 GMT (envelope-from mjacob@svn.freebsd.org)
Received: (from mjacob@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5THAtIC084577;
	Tue, 29 Jun 2010 17:10:55 GMT (envelope-from mjacob@svn.freebsd.org)
Message-Id: <201006291710.o5THAtIC084577@svn.freebsd.org>
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Tue, 29 Jun 2010 17:10:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209590 - head/sys/cam
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Jun 2010 17:10:56 -0000

Author: mjacob
Date: Tue Jun 29 17:10:55 2010
New Revision: 209590
URL: http://svn.freebsd.org/changeset/base/209590

Log:
  Don't lock buses around a call to xptperiphlistmatch- the buses will be
  locked at appropriate places.
  
  MFC after:	1 week
  X-MFC:		208752

Modified:
  head/sys/cam/cam_xpt.c

Modified: head/sys/cam/cam_xpt.c
==============================================================================
--- head/sys/cam/cam_xpt.c	Tue Jun 29 16:57:30 2010	(r209589)
+++ head/sys/cam/cam_xpt.c	Tue Jun 29 17:10:55 2010	(r209590)
@@ -2683,9 +2683,7 @@ xpt_action_default(union ccb *start_ccb)
 			xptedtmatch(cdm);
 			break;
 		case CAM_DEV_POS_PDRV:
-			xpt_lock_buses();
 			xptperiphlistmatch(cdm);
-			xpt_unlock_buses();
 			break;
 		default:
 			cdm->status = CAM_DEV_MATCH_ERROR;