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");
}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
