From owner-svn-src-head@FreeBSD.ORG  Tue Aug 17 17:11:15 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 64AD9106567A;
	Tue, 17 Aug 2010 17:11:15 +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 54ACC8FC12;
	Tue, 17 Aug 2010 17:11:15 +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 o7HHBFRv039175;
	Tue, 17 Aug 2010 17:11:15 GMT (envelope-from mjacob@svn.freebsd.org)
Received: (from mjacob@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7HHBFce039173;
	Tue, 17 Aug 2010 17:11:15 GMT (envelope-from mjacob@svn.freebsd.org)
Message-Id: <201008171711.o7HHBFce039173@svn.freebsd.org>
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Tue, 17 Aug 2010 17:11:15 +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: r211434 - 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: Tue, 17 Aug 2010 17:11:15 -0000

Author: mjacob
Date: Tue Aug 17 17:11:15 2010
New Revision: 211434
URL: http://svn.freebsd.org/changeset/base/211434

Log:
  Now is as good a time as any to find out if we induce breakage
  by issueing aborts for any pending commands when we're decommssioning
  a disk.
  
  MFC after:	3 months

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

Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c	Tue Aug 17 16:41:16 2010	(r211433)
+++ head/sys/cam/scsi/scsi_da.c	Tue Aug 17 17:11:15 2010	(r211434)
@@ -958,6 +958,8 @@ 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;
@@ -967,15 +969,29 @@ 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");
 }