PERFORCE change 169485 for review

[Alexander Motin]

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

Change 169485 by mav at mav_mavbook on 2009/10/14 11:20:29

	No need to lock PMP, just reference it. We can't lock it in async
	handler, as it may try to sleep.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#7 edit

Differences ...

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

@@ -252,7 +252,7 @@
 		if (code == AC_SENT_BDR || code == AC_BUS_RESET)
 			softc->found = 0; /* We have to reset everything. */
 		softc->state = PMP_STATE_PORTS;
-		(void)cam_periph_hold(periph, PRIBIO);
+		cam_periph_acquire(periph);
 		xpt_schedule(periph, CAM_PRIORITY_BUS);
 		break;
 	default:
@@ -348,7 +348,7 @@
 	 * to finish the probe.  The reference will be dropped in pmpdone at
 	 * the end of probe.
 	 */
-	(void)cam_periph_hold(periph, PRIBIO);
+	(void)cam_periph_acquire(periph);
 	xpt_schedule(periph, CAM_PRIORITY_BUS);
 
 	return(CAM_REQ_CMP);
@@ -682,7 +682,7 @@
 		break;
 	}
 	softc->state = PMP_STATE_NORMAL;
-	cam_periph_unhold(periph);
+	cam_periph_release_locked(periph);
 }
 
 #endif /* _KERNEL */