From owner-svn-src-all@FreeBSD.ORG  Thu Feb 26 23:21:32 2009
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 C933A106564A;
	Thu, 26 Feb 2009 23:21:32 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B59398FC1E;
	Thu, 26 Feb 2009 23:21:32 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1QNLW7n041120;
	Thu, 26 Feb 2009 23:21:32 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1QNLWIp041119;
	Thu, 26 Feb 2009 23:21:32 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200902262321.n1QNLWIp041119@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 26 Feb 2009 23:21:32 +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: r189095 - head/sys/dev/ata
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: Thu, 26 Feb 2009 23:21:34 -0000

Author: mav
Date: Thu Feb 26 23:21:32 2009
New Revision: 189095
URL: http://svn.freebsd.org/changeset/base/189095

Log:
  Rollback rev. 189093.
  
  mtx_lock() is not needed there as callout initialized with callout_init_mtx().
  Sorry.
  
  Submitted by:	Ian Dowse

Modified:
  head/sys/dev/ata/ata-queue.c

Modified: head/sys/dev/ata/ata-queue.c
==============================================================================
--- head/sys/dev/ata/ata-queue.c	Thu Feb 26 23:07:40 2009	(r189094)
+++ head/sys/dev/ata/ata-queue.c	Thu Feb 26 23:21:32 2009	(r189095)
@@ -497,7 +497,6 @@ ata_timeout(struct ata_request *request)
     //request->flags |= ATA_R_DEBUG;
     ATA_DEBUG_RQ(request, "timeout");
 
-    mtx_lock(&ch->state_mtx);
     /*
      * if we have an ATA_ACTIVE request running, we flag the request 
      * ATA_R_TIMEOUT so ata_finish will handle it correctly