Date: Tue, 17 Aug 2010 17:11:15 +0000 (UTC) From: Matt Jacob <mjacob@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r211434 - head/sys/cam/scsi Message-ID: <201008171711.o7HHBFce039173@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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"); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008171711.o7HHBFce039173>