PERFORCE change 170134 for review

[Alexander Motin]

http://p4web.freebsd.org/chv.cgi?CH=170134

Change 170134 by mav at mav_mavtest on 2009/11/03 21:41:08

	Remove some deprecated things.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#38 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#38 (text+ko) ====

@@ -103,8 +103,6 @@
 
 struct ada_softc {
 	struct	 bio_queue_head bio_queue;
-	SLIST_ENTRY(ada_softc) links;
-	LIST_HEAD(, ccb_hdr) pending_ccbs;
 	ada_state state;
 	ada_flags flags;	
 	ada_quirks quirks;
@@ -611,7 +609,6 @@
 		return(CAM_REQ_CMP_ERR);
 	}
 
-	LIST_INIT(&softc->pending_ccbs);
 	bioq_init(&softc->bio_queue);
 
 	if (cgd->ident_data.capabilities1 & ATA_SUPPORT_DMA)
@@ -850,19 +847,10 @@
 				break;
 			}
 			start_ccb->ccb_h.ccb_state = ADA_CCB_BUFFER_IO;
-
-			/*
-			 * Block out any asyncronous callbacks
-			 * while we touch the pending ccb list.
-			 */
-			LIST_INSERT_HEAD(&softc->pending_ccbs,
-					 &start_ccb->ccb_h, periph_links.le);
+			start_ccb->ccb_h.ccb_bp = bp;
 			softc->outstanding_cmds++;
-
-			start_ccb->ccb_h.ccb_bp = bp;
+			xpt_action(start_ccb);
 			bp = bioq_first(&softc->bio_queue);
-
-			xpt_action(start_ccb);
 		}
 		
 		if (bp != NULL) {
@@ -939,12 +927,6 @@
 			if (ataio->resid > 0)
 				bp->bio_flags |= BIO_ERROR;
 		}
-
-		/*
-		 * Block out any asyncronous callbacks
-		 * while we touch the pending ccb list.
-		 */
-		LIST_REMOVE(&done_ccb->ccb_h, periph_links.le);
 		softc->outstanding_cmds--;
 		if (softc->outstanding_cmds == 0)
 			softc->flags |= ADA_FLAG_WENT_IDLE;