svn commit: r273818 - releng/10.1/sys/cam/ata

[Steven Hartland]

Author: smh
Date: Wed Oct 29 11:11:54 2014
New Revision: 273818
URL: https://svnweb.freebsd.org/changeset/base/273818

Log:
  MFS10 r273814
  MFC r273704
  
  Fix ATA CF ERASE breakage caused by 268205
  
  PR:		194606
  Approved by:	re (marius)
  Sponsored by:	Multiplay

Modified:
  releng/10.1/sys/cam/ata/ata_da.c
Directory Properties:
  releng/10.1/   (props changed)

Modified: releng/10.1/sys/cam/ata/ata_da.c
==============================================================================
--- releng/10.1/sys/cam/ata/ata_da.c	Wed Oct 29 11:07:40 2014	(r273817)
+++ releng/10.1/sys/cam/ata/ata_da.c	Wed Oct 29 11:11:54 2014	(r273818)
@@ -1467,9 +1467,15 @@ ada_dsmtrim(struct ada_softc *softc, str
 static void
 ada_cfaerase(struct ada_softc *softc, struct bio *bp, struct ccb_ataio *ataio)
 {
+	struct trim_request *req = &softc->trim_req;
 	uint64_t lba = bp->bio_pblkno;
 	uint16_t count = bp->bio_bcount / softc->params.secsize;
 
+	bzero(req, sizeof(*req));
+	TAILQ_INIT(&req->bps);
+	bioq_remove(&softc->trim_queue, bp);
+	TAILQ_INSERT_TAIL(&req->bps, bp, bio_queue);
+
 	cam_fill_ataio(ataio,
 	    ada_retry_count,
 	    adadone,