From owner-svn-src-head@FreeBSD.ORG  Fri Aug 20 17:20:06 2010
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 276A710656A5;
	Fri, 20 Aug 2010 17:20:06 +0000 (UTC)
	(envelope-from mjacob@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 178398FC08;
	Fri, 20 Aug 2010 17:20:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7KHK5Z1043512;
	Fri, 20 Aug 2010 17:20:05 GMT (envelope-from mjacob@svn.freebsd.org)
Received: (from mjacob@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7KHK5T4043510;
	Fri, 20 Aug 2010 17:20:05 GMT (envelope-from mjacob@svn.freebsd.org)
Message-Id: <201008201720.o7KHK5T4043510@svn.freebsd.org>
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Fri, 20 Aug 2010 17:20:05 +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: r211529 - head/sys/cam/scsi
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, 20 Aug 2010 17:20:06 -0000

Author: mjacob
Date: Fri Aug 20 17:20:05 2010
New Revision: 211529
URL: http://svn.freebsd.org/changeset/base/211529

Log:
  Revert r211434. Offline discussions have convinced me that this should
  be left alone for now.

Modified:
  head/sys/cam/scsi/scsi_da.c

Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c	Fri Aug 20 16:00:36 2010	(r211528)
+++ head/sys/cam/scsi/scsi_da.c	Fri Aug 20 17:20:05 2010	(r211529)
@@ -958,8 +958,6 @@ dainit(void)
 static void
 daoninvalidate(struct cam_periph *periph)
 {
-	struct ccb_abort cab;
-	struct ccb_hdr *ccb_h, *ccb_h_t;
 	struct da_softc *softc;
 
 	softc = (struct da_softc *)periph->softc;
@@ -969,29 +967,15 @@ daoninvalidate(struct cam_periph *periph
 	 */
 	xpt_register_async(0, daasync, periph, periph->path);
 
-	/*
-	 * Invalidate the pack label
-	 */
 	softc->flags |= DA_FLAG_PACK_INVALID;
 
 	/*
 	 * Return all queued I/O with ENXIO.
+	 * XXX Handle any transactions queued to the card
+	 *     with XPT_ABORT_CCB.
 	 */
 	bioq_flush(&softc->bio_queue, NULL, ENXIO);
 
-	/*
-	 * Issue aborts for any pending commands.
-	 */
-	xpt_setup_ccb(&cab.ccb_h, periph->path, CAM_PRIORITY_NORMAL+1);
-	cab.ccb_h.func_code = XPT_ABORT;
-	LIST_FOREACH_SAFE(ccb_h, &softc->pending_ccbs, periph_links.le, ccb_h_t) {
-		cab.abort_ccb = (union ccb *)ccb_h;
-		xpt_action((union ccb *)&cab);
-	}
-
-	/*
-	 * This disk is *history*....
-	 */
 	disk_gone(softc->disk);
 	xpt_print(periph->path, "lost device\n");
 }