From owner-svn-src-all@FreeBSD.ORG  Fri Nov  1 00:14:15 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id D831F58D;
 Fri,  1 Nov 2013 00:14:15 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C59822DFA;
 Fri,  1 Nov 2013 00:14:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA10EFC3027889;
 Fri, 1 Nov 2013 00:14:15 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA10EFDs027888;
 Fri, 1 Nov 2013 00:14:15 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201311010014.rA10EFDs027888@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 1 Nov 2013 00:14:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r257482 - head/sys/cam
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Fri, 01 Nov 2013 00:14:15 -0000

Author: mav
Date: Fri Nov  1 00:14:15 2013
New Revision: 257482
URL: http://svnweb.freebsd.org/changeset/base/257482

Log:
  Fix lock recursion, triggered by `smartctl -a /dev/adaX`.

Modified:
  head/sys/cam/cam_xpt.c

Modified: head/sys/cam/cam_xpt.c
==============================================================================
--- head/sys/cam/cam_xpt.c	Thu Oct 31 23:58:31 2013	(r257481)
+++ head/sys/cam/cam_xpt.c	Fri Nov  1 00:14:15 2013	(r257482)
@@ -2200,7 +2200,7 @@ xptperiphtraverse(struct cam_ed *device,
 	for (; periph != NULL; periph = next_periph) {
 		retval = tr_func(periph, arg);
 		if (retval == 0) {
-			cam_periph_release(periph);
+			cam_periph_release_locked(periph);
 			break;
 		}
 		xpt_lock_buses();