svn commit: r273814 - stable/10/sys/cam/ata

[Steven Hartland]

Author: smh
Date: Wed Oct 29 09:27:24 2014
New Revision: 273814
URL: https://svnweb.freebsd.org/changeset/base/273814

Log:
  MFC: r273704
  
  Fix CF ERASE breakage caused by 268205.
  
  Sponsored by:	Multiplay

Modified:
  stable/10/sys/cam/ata/ata_da.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/ata/ata_da.c
==============================================================================
--- stable/10/sys/cam/ata/ata_da.c	Wed Oct 29 09:26:55 2014	(r273813)
+++ stable/10/sys/cam/ata/ata_da.c	Wed Oct 29 09:27:24 2014	(r273814)
@@ -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,