From owner-svn-src-head@FreeBSD.ORG  Fri Jul 17 21:48:08 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 952031065670;
	Fri, 17 Jul 2009 21:48:08 +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 83A768FC1B;
	Fri, 17 Jul 2009 21:48:08 +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 n6HLm8CA083063;
	Fri, 17 Jul 2009 21:48:08 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6HLm8uT083061;
	Fri, 17 Jul 2009 21:48:08 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200907172148.n6HLm8uT083061@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 17 Jul 2009 21:48:08 +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: r195748 - head/sys/cam/ata
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 17 Jul 2009 21:48:09 -0000

Author: mav
Date: Fri Jul 17 21:48:08 2009
New Revision: 195748
URL: http://svn.freebsd.org/changeset/base/195748

Log:
  Fix copy-paste bug. Use regular non-polled mode for executing FLUSHCACHE
  command on disk close.
  
  Approved by:	re (implicitly)

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

Modified: head/sys/cam/ata/ata_da.c
==============================================================================
--- head/sys/cam/ata/ata_da.c	Fri Jul 17 21:15:09 2009	(r195747)
+++ head/sys/cam/ata/ata_da.c	Fri Jul 17 21:48:08 2009	(r195748)
@@ -275,7 +275,6 @@ adaclose(struct disk *dp)
 	if (softc->flags & ADA_FLAG_CAN_FLUSHCACHE) {
 
 		ccb = cam_periph_getccb(periph, /*priority*/1);
-		ccb->ccb_h.ccb_state = ADA_CCB_DUMP;
 		cam_fill_ataio(&ccb->ataio,
 				    1,
 				    adadone,
@@ -289,7 +288,9 @@ adaclose(struct disk *dp)
 			ata_48bit_cmd(&ccb->ataio, ATA_FLUSHCACHE48, 0, 0, 0);
 		else
 			ata_48bit_cmd(&ccb->ataio, ATA_FLUSHCACHE, 0, 0, 0);
-		xpt_polled_action(ccb);
+		cam_periph_runccb(ccb, /*error_routine*/NULL, /*cam_flags*/0,
+		    /*sense_flags*/SF_RETRY_UA,
+		    softc->disk->d_devstat);
 
 		if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)
 			xpt_print(periph->path, "Synchronize cache failed\n");