Drop the periph/sim lock when calling disk_destroy().

2 files changed, 3 insertions, 5 deletions

diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index fa85ada..fde3c25 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -486,7 +486,9 @@ cdcleanup(struct cam_periph *periph)
 		xpt_print(periph->path, "removing changer entry\n");
 		free(softc->changer, M_DEVBUF);
 	}
+	cam_periph_unlock(periph);
 	disk_destroy(softc->disk);
+	cam_periph_lock(periph);
 	free(softc, M_DEVBUF);
 }
 
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index f799e44..558360b 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -939,13 +939,9 @@ dacleanup(struct cam_periph *periph)
 	    && sysctl_ctx_free(&softc->sysctl_ctx) != 0) {
 		xpt_print(periph->path, "can't remove sysctl context\n");
 	}
-	disk_destroy(softc->disk);
 
-	/*
-	 * XXX Gotta drop the periph lock so that the drain can complete with
-	 * deadlocking on the lock.  Hopefully dropping here is safe.
-	 */
 	cam_periph_unlock(periph);
+	disk_destroy(softc->disk);
 	callout_drain(&softc->sendordered_c);
 	cam_periph_lock(periph);
 	free(softc, M_DEVBUF);