PERFORCE change 165385 for review

[Alexander Motin]

http://perforce.freebsd.org/chv.cgi?CH=165385

Change 165385 by mav at mav_mavbook on 2009/06/29 09:55:13

	Fix locking issue.

Affected files ...

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

Differences ...

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

@@ -714,6 +714,17 @@
 		softc->disk->d_flags |= DISKFLAG_CANFLUSHCACHE;
 
 	adasetgeom(periph, cgd);
+	softc->disk->d_sectorsize = softc->params.secsize;
+	softc->disk->d_mediasize = softc->params.secsize * (off_t)softc->params.sectors;
+	/* XXX: these are not actually "firmware" values, so they may be wrong */
+	softc->disk->d_fwsectors = softc->params.secs_per_track;
+	softc->disk->d_fwheads = softc->params.heads;
+//	softc->disk->d_devstat->block_size = softc->params.secsize;
+//	softc->disk->d_devstat->flags &= ~DEVSTAT_BS_UNAVAILABLE;
+
+	disk_create(softc->disk, DISK_VERSION);
+	mtx_lock(periph->sim->mtx);
+
 	dp = &softc->params;
 	snprintf(announce_buf, sizeof(announce_buf),
 		"%juMB (%ju %u byte sectors: %dH %dS/T %dC)",
@@ -728,17 +739,6 @@
 		       periph->periph_name, periph->unit_number);
 	}
 
-	softc->disk->d_sectorsize = softc->params.secsize;
-	softc->disk->d_mediasize = softc->params.secsize * (off_t)softc->params.sectors;
-	/* XXX: these are not actually "firmware" values, so they may be wrong */
-	softc->disk->d_fwsectors = softc->params.secs_per_track;
-	softc->disk->d_fwheads = softc->params.heads;
-//	softc->disk->d_devstat->block_size = softc->params.secsize;
-//	softc->disk->d_devstat->flags &= ~DEVSTAT_BS_UNAVAILABLE;
-
-	disk_create(softc->disk, DISK_VERSION);
-	mtx_lock(periph->sim->mtx);
-
 	/*
 	 * Add async callbacks for bus reset and
 	 * bus device reset calls.  I don't bother