From owner-svn-src-projects@FreeBSD.ORG  Fri Sep  6 08:21:55 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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id D5945A49;
 Fri,  6 Sep 2013 08:21:55 +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 C43A726B7;
 Fri,  6 Sep 2013 08:21:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r868LtmD014871;
 Fri, 6 Sep 2013 08:21:55 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r868Lt7u014870;
 Fri, 6 Sep 2013 08:21:55 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201309060821.r868Lt7u014870@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 6 Sep 2013 08:21:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r255295 - projects/camlock/sys/dev/ata
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: Fri, 06 Sep 2013 08:21:55 -0000

Author: mav
Date: Fri Sep  6 08:21:55 2013
New Revision: 255295
URL: http://svnweb.freebsd.org/changeset/base/255295

Log:
  Remove requests completion batching from ata(4) driver.  Since this driver
  periodically simulates list interrupts it may cause assertion on double
  nested batching attempt.

Modified:
  projects/camlock/sys/dev/ata/ata-all.c

Modified: projects/camlock/sys/dev/ata/ata-all.c
==============================================================================
--- projects/camlock/sys/dev/ata/ata-all.c	Fri Sep  6 07:58:23 2013	(r255294)
+++ projects/camlock/sys/dev/ata/ata-all.c	Fri Sep  6 08:21:55 2013	(r255295)
@@ -352,11 +352,9 @@ ata_interrupt(void *data)
 {
     struct ata_channel *ch = (struct ata_channel *)data;
 
-    xpt_batch_start(ch->sim);
     mtx_lock(&ch->state_mtx);
     ata_interrupt_locked(data);
     mtx_unlock(&ch->state_mtx);
-    xpt_batch_done(ch->sim);
 }
 
 static void