svn commit: r249106 - in head/sys/cam: ata scsi

[Alexander Motin]

Author: mav
Date: Thu Apr  4 19:07:37 2013
New Revision: 249106
URL: http://svnweb.freebsd.org/changeset/base/249106

Log:
  MFprojects/camlock r248931:
  Replace some direct mutex operations with wrappers.
  
  MFC after:	2 weeks

Modified:
  head/sys/cam/ata/ata_da.c
  head/sys/cam/scsi/scsi_cd.c
  head/sys/cam/scsi/scsi_da.c
  head/sys/cam/scsi/scsi_pass.c

Modified: head/sys/cam/ata/ata_da.c
==============================================================================
--- head/sys/cam/ata/ata_da.c	Thu Apr  4 19:04:15 2013	(r249105)
+++ head/sys/cam/ata/ata_da.c	Thu Apr  4 19:07:37 2013	(r249106)
@@ -1114,7 +1114,7 @@ adaregister(struct cam_periph *periph, v
 	 * Register this media as a disk
 	 */
 	(void)cam_periph_hold(periph, PRIBIO);
-	mtx_unlock(periph->sim->mtx);
+	cam_periph_unlock(periph);
 	snprintf(announce_buf, sizeof(announce_buf),
 	    "kern.cam.ada.%d.quirks", periph->unit_number);
 	quirks = softc->quirks;
@@ -1208,7 +1208,7 @@ adaregister(struct cam_periph *periph, v
 	} else
 		legacy_id = -1;
 	disk_create(softc->disk, DISK_VERSION);
-	mtx_lock(periph->sim->mtx);
+	cam_periph_lock(periph);
 	cam_periph_unhold(periph);
 
 	dp = &softc->params;

Modified: head/sys/cam/scsi/scsi_cd.c
==============================================================================
--- head/sys/cam/scsi/scsi_cd.c	Thu Apr  4 19:04:15 2013	(r249105)
+++ head/sys/cam/scsi/scsi_cd.c	Thu Apr  4 19:07:37 2013	(r249106)
@@ -1446,7 +1446,7 @@ cdgetccb(struct cam_periph *periph, u_in
 				softc->changer->flags |= CHANGER_MANUAL_CALL;
 				cdrunchangerqueue(softc->changer);
 			} else
-				msleep(&softc->changer, periph->sim->mtx,
+				cam_periph_sleep(periph, &softc->changer,
 				    PRIBIO, "cgticb", 0);
 		}
 	}

Modified: head/sys/cam/scsi/scsi_da.c
==============================================================================
--- head/sys/cam/scsi/scsi_da.c	Thu Apr  4 19:04:15 2013	(r249105)
+++ head/sys/cam/scsi/scsi_da.c	Thu Apr  4 19:07:37 2013	(r249106)
@@ -988,7 +988,7 @@ daopen(struct disk *dp)
 	dareprobe(periph);
 
 	/* Wait for the disk size update.  */
-	error = msleep(&softc->disk->d_mediasize, periph->sim->mtx, PRIBIO,
+	error = cam_periph_sleep(periph, &softc->disk->d_mediasize, PRIBIO,
 	    "dareprobe", 0);
 	if (error != 0)
 		xpt_print(periph->path, "unable to retrieve capacity data");
@@ -1688,7 +1688,7 @@ daregister(struct cam_periph *periph, vo
 	    (da_default_timeout * hz) / DA_ORDEREDTAG_INTERVAL,
 	    dasendorderedtag, softc);
 
-	mtx_unlock(periph->sim->mtx);
+	cam_periph_unlock(periph);
 	/*
 	 * RBC devices don't have to support READ(6), only READ(10).
 	 */
@@ -1773,12 +1773,12 @@ daregister(struct cam_periph *periph, vo
 	if (cam_periph_acquire(periph) != CAM_REQ_CMP) {
 		xpt_print(periph->path, "%s: lost periph during "
 			  "registration!\n", __func__);
-		mtx_lock(periph->sim->mtx);
+		cam_periph_lock(periph);
 		return (CAM_REQ_CMP_ERR);
 	}
 
 	disk_create(softc->disk, DISK_VERSION);
-	mtx_lock(periph->sim->mtx);
+	cam_periph_lock(periph);
 
 	/*
 	 * Add async callbacks for events of interest.

Modified: head/sys/cam/scsi/scsi_pass.c
==============================================================================
--- head/sys/cam/scsi/scsi_pass.c	Thu Apr  4 19:04:15 2013	(r249105)
+++ head/sys/cam/scsi/scsi_pass.c	Thu Apr  4 19:07:37 2013	(r249106)
@@ -381,7 +381,7 @@ passregister(struct cam_periph *periph, 
 	 * know what the blocksize of this device is, if 
 	 * it even has a blocksize.
 	 */
-	mtx_unlock(periph->sim->mtx);
+	cam_periph_unlock(periph);
 	no_tags = (cgd->inq_data.flags & SID_CmdQue) == 0;
 	softc->device_stats = devstat_new_entry("pass",
 			  periph->unit_number, 0,
@@ -417,7 +417,7 @@ passregister(struct cam_periph *periph, 
 	 */
 	dev_ref(softc->dev);
 
-	mtx_lock(periph->sim->mtx);
+	cam_periph_lock(periph);
 	softc->dev->si_drv1 = periph;
 
 	TASK_INIT(&softc->add_physpath_task, /*priority*/0,