From owner-svn-src-head@FreeBSD.ORG  Sat Apr  6 17:14:57 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5C32AD4C;
 Sat,  6 Apr 2013 17:14:57 +0000 (UTC) (envelope-from mav@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 4FB2F790;
 Sat,  6 Apr 2013 17:14:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r36HEv6B066974;
 Sat, 6 Apr 2013 17:14:57 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r36HEvUl066973;
 Sat, 6 Apr 2013 17:14:57 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201304061714.r36HEvUl066973@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 6 Apr 2013 17:14:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249205 - head/sys/cam/ata
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Apr 2013 17:14:57 -0000

Author: mav
Date: Sat Apr  6 17:14:56 2013
New Revision: 249205
URL: http://svnweb.freebsd.org/changeset/base/249205

Log:
  Replicate r245306 from SCSI to ATA.  The problem didn't appear so far,
  covered by multilevel freeze mechanism, but it is better to be safe.

Modified:
  head/sys/cam/ata/ata_da.c

Modified: head/sys/cam/ata/ata_da.c
==============================================================================
--- head/sys/cam/ata/ata_da.c	Sat Apr  6 17:00:11 2013	(r249204)
+++ head/sys/cam/ata/ata_da.c	Sat Apr  6 17:14:56 2013	(r249205)
@@ -614,6 +614,9 @@ adaschedule(struct cam_periph *periph)
 	struct ada_softc *softc = (struct ada_softc *)periph->softc;
 	uint32_t prio;
 
+	if (softc->state != ADA_STATE_NORMAL)
+		return;
+
 	/* Check if cam_periph_getccb() was called. */
 	prio = periph->immediate_priority;